Mercurial > hg

changeset 4312:82be6af21697

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with Matt
author Brendan Cully <brendan@kublai.com>
date Thu, 05 Apr 2007 14:55:27 -0700
parents 1043e4b27ab9 (current diff) 09c5f734ff6a (diff)
children 61ab822a9e88
files
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Tue Feb 27 09:05:36 2007 +0100
+++ b/mercurial/merge.py	Thu Apr 05 14:55:27 2007 -0700
@@ -129,15 +129,15 @@
         '''check possible copies for filectx c'''
         for of in findold(c):
             if of not in man:
-                return
+                continue
             c2 = ctx(of, man[of])
             ca = c.ancestor(c2)
             if not ca: # unrelated
-                return
+                continue
             if ca.path() == c.path() or ca.path() == c2.path():
                 fullcopy[c.path()] = of
-                if c == ca or c2 == ca: # no merge needed, ignore copy
-                    return
+                if c == ca and c2 == ca: # no merge needed, ignore copy
+                    continue
                 copy[c.path()] = of
 
     def dirs(files):