[Commented On] D8616: merge: chain copies with existing copies in working copy

[marmoute (Pierre-Yves David)]

marmoute added inline comments.

INLINE COMMENTS

> merge.py:1916-1921
> +            if dst == src:
> +                continue
> +            if dst not in wc:
> +                continue
> +            if not (src in wc.p1() or src in wc.p2()):
> +                continue

I am not sure why we gain all these new cases? where do they comes from?

REPOSITORY
  rHG Mercurial

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

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

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