[Updated] D9415: copies: fast path no-op merge

marmoute (Pierre-Yves David) phabricator at mercurial-scm.org
Sun Nov 29 19:56:12 UTC 2020


Closed by commit rHGcf04af3a5ef1: copies: fast path no-op merge (authored by marmoute).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D9415?vs=23813&id=23861

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

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

AFFECTED FILES
  mercurial/copies.py

CHANGE DETAILS

diff --git a/mercurial/copies.py b/mercurial/copies.py
--- a/mercurial/copies.py
+++ b/mercurial/copies.py
@@ -366,6 +366,9 @@
             othercopies = all_copies.get(c)
             if othercopies is None:
                 all_copies[c] = newcopies
+            elif newcopies is othercopies:
+                # nothing to merge:
+                pass
             else:
                 # we are the second parent to work on c, we need to merge our
                 # work with the other.



To: Alphare, #hg-reviewers, pulkit
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20201129/94191135/attachment-0002.html>


More information about the Mercurial-patches mailing list