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

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Thu Jun 11 13:51:18 UTC 2020


martinvonz added inline comments.

INLINE COMMENTS

> marmoute wrote in merge.py:1916-1921
> I am not sure why we gain all these new cases? where do they comes from?

Did you miss the comment I added on line 1914 or do you think it's not enough? Each case is documented there.

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/9b2a12c6/attachment-0002.html>


More information about the Mercurial-patches mailing list