Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
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)
authorBenoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 02 Feb 2010 09:05:20 +0100
changeset 10313 31141fd7c9cc
parent 10302 00099580ca35
child 10314 d9aa5b368e36
copies: check if revisions are related (bug found with pylint)
mercurial/copies.py file | annotate | diff | comparison | revisions 
--- 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
mercurial