Mercurial > hg-stable

changeset 6271:01aed23355e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: more simplifications to checkcopies
author Matt Mackall <mpm@selenic.com>
date Sat, 15 Mar 2008 10:02:31 -0500
parents 14f0fe2e2db7
children dd9bd227ae9a
files mercurial/merge.py
diffstat 1 files changed, 12 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Sat Mar 15 10:02:31 2008 -0500
+++ b/mercurial/merge.py	Sat Mar 15 10:02:31 2008 -0500
@@ -123,23 +123,18 @@
         c1 = ctx(f, m1[f])
         for of in _findoldnames(c1, limit):
             fullcopy[f] = of # remember for dir rename detection
-            if of not in m2: # original file not in other manifest?
-                if of in ma:
-                    diverge.setdefault(of, []).append(f)
-                continue
-            # if the original file is unchanged on the other branch,
-            # no merge needed
-            if m2[of] == ma.get(of):
-                continue
-            c2 = ctx(of, m2[of])
-            ca = c1.ancestor(c2)
-            if not ca: # unrelated?
-                continue
-            # named changed on only one side?
-            if ca.path() == f or ca.path() == c2.path():
-                if c1 == ca and c2 == ca: # no merge needed, ignore copy
-                    continue
-                copy[f] = of
+            if of in m2: # original file not in other manifest?
+                # if the original file is unchanged on the other branch,
+                # no merge needed
+                if m2[of] != ma.get(of):
+                    c2 = ctx(of, m2[of])
+                    ca = c1.ancestor(c2)
+                    # related and named changed on only one side?
+                    if ca and ca.path() == f or ca.path() == c2.path():
+                        if c1 != ca or c2 != ca: # merge needed?
+                            copy[f] = of
+            elif of in ma:
+                diverge.setdefault(of, []).append(f)
 
     if not repo.ui.configbool("merge", "followcopies", True):
         return {}, {}