[Commented On] D11879: simplemerge: stop merging file flags

[martinvonz (Martin von Zweigbergk)]

martinvonz added a comment.


  In D11879#182993 <https://phab.mercurial-scm.org/D11879#182993>, @marmoute wrote:
  
  > Thanks for your patience/
  
  No problem, this code took me a while to understand.
  
  > If you could follow up with a comment pointing out what is going on flag-wise in simplemerge.py, that would be great.
  
  For now, I just added that comment saying that the flag-merging happens in `mergestate.resolve()` (I added that already before your request, I mean). There isn't any flag-merging going on in `simplemerge.py` after this patch. What would the comment you're thinking of say?
  
  I have considered having `simplemerge()` just return the merged text instead. If I do that, it becomes obvious that flags are not merged and I'll remove the comment added in this patch.

REPOSITORY
  rHG Mercurial

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

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

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