[Commented On] D8596: merge: mark copies in in-memory context when merging

[martinvonz (Martin von Zweigbergk)]

martinvonz added inline comments.

INLINE COMMENTS

> marmoute wrote in merge.py:1170
> I don't understand this docstring. From what I see of the code, it mostly pull things from an actions dictionnary to put them in a copies dictionnary. That does not seems to involves the dirstates nor any "recording". Am I missing something ?

> I don't understand this docstring. From what I see of the code, it mostly pull things from an actions dictionnary to put them in a copies dictionnary. That does not seems to involves the dirstates nor any "recording". Am I missing something ?

I suspect that all you're missing is https://www.mercurial-scm.org/repo/hg/file/61719b9658b1/mercurial/mergestate.py#l758 (or maybe you just didn't infer that this was a bad copy from there) :) Fixed.

> marmoute wrote in merge.py:1891
> I don't know what `overwrite` means and the docstring does not mention it. Can you clarify this and fix the docstring ?

It's defined on line 1631 and used a few times thereafter. Would you like a comment in each place it's used? I can add that in a separate patch. I don't know think there's a relevant docstring to update.

REPOSITORY
  rHG Mercurial

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

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

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