[Commented On] D8552: fix: use context to fetch mergestate instead of loading it directly

marmoute (Pierre-Yves David) phabricator at mercurial-scm.org
Tue Jun 9 08:40:24 UTC 2020


marmoute added a comment.


  In D8552#128621 <https://phab.mercurial-scm.org/D8552#128621>, @martinvonz wrote:
  
  > In D8552#128605 <https://phab.mercurial-scm.org/D8552#128605>, @marmoute wrote:
  >
  >> @martinvonz can you clarify why mergestate on an `overlayworkingctx` would never make sense ?
  >
  > That makes sense. What I said does not make sense is to check for unresolved merge conflicts (before starting an operation).
  
  Checking for unresolved merge conflict on an `overlayworkingctx` does not make sense because the overlayctx is new and therefor will always be conflict free ?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8552/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8552

To: durin42, #hg-reviewers, marmoute
Cc: marmoute, martinvonz, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200609/8389fa3a/attachment-0002.html>


More information about the Mercurial-patches mailing list