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

[marmoute (Pierre-Yves David)]

marmoute added a comment.


  I have a bunch a questions.

INLINE COMMENTS

> merge.py:1170
> +def _extract_copies(actions, branchmerge):
> +    """record merge actions to the dirstate"""
> +    copies = {}

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 ?

> merge.py:1891
> +        copies = {}
> +        if not overwrite:
> +            copies = _extract_copies(actions, branchmerge)

I don't know what `overwrite` means and the docstring does not mention it. Can you clarify this and fix the docstring ?

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/853de4b6/attachment-0002.html>