Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 3674:9103dab96093

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid unnecessary copy merges
author Matt Mackall <mpm@selenic.com>
date Sat, 18 Nov 2006 11:34:19 -0600
parents eb0b4a2d70a9
children 91690473856c
line wrap: on
line diff
--- a/mercurial/merge.py	Fri Nov 17 08:06:54 2006 +0100
+++ b/mercurial/merge.py	Sat Nov 18 11:34:19 2006 -0600
@@ -139,6 +139,8 @@
         ''' check if an apparent pair actually matches '''
         c2 = ctx(f2, man[f2])
         ca = c.ancestor(c2)
+        if c == ca or c2 == ca:
+            return
         if ca and ca.path() == c.path() or ca.path() == c2.path():
             copy[c.path()] = f2
             copy[f2] = c.path()