Mercurial > hg

changeset 10313:31141fd7c9cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: check if revisions are related (bug found with pylint)
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 02 Feb 2010 09:05:20 +0100
parents 00099580ca35
children d9aa5b368e36
files mercurial/copies.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/copies.py	Sun Jan 31 13:43:33 2010 -0600
+++ b/mercurial/copies.py	Tue Feb 02 09:05:20 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