--- a/mercurial/merge.py Mon Apr 02 14:16:44 2007 -0500
+++ b/mercurial/merge.py Thu Apr 05 16:25:47 2007 -0500
@@ -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):