Mercurial > hg

changeset 10314:d9aa5b368e36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with main
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 02 Feb 2010 09:13:59 +0100
parents 31141fd7c9cc (diff) 131a012aa878 (current diff)
children d117089386e2
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/copies.py	Mon Feb 01 11:34:44 2010 -0600
+++ b/mercurial/copies.py	Tue Feb 02 09:13:59 2010 +0100
@@ -154,7 +154,7 @@
                 break # no merge needed, quit early
             c2 = ctx(of, m2[of])
             cr = related(oc, c2, ca.rev())
-            if of == f or of == c2.path(): # non-divergent
+            if cr and (of == f or of == c2.path()): # non-divergent
                 copy[f] = of
                 of = None
                 break