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.
Merge with stable
authorMatt Mackall <mpm@selenic.com>
Sun, 31 Jan 2010 13:43:33 -0600
changeset 10302 00099580ca35
parent 10301 56b50194617f (current diff)
parent 10298 4a1034687ef7 (diff)
child 10309 0df9e63f0c07
child 10313 31141fd7c9cc
Merge with stable
mercurial/copies.py file | annotate | diff | comparison | revisions 
--- a/mercurial/copies.py	Sun Jan 24 20:51:53 2010 +0100
+++ b/mercurial/copies.py	Sun Jan 31 13:43:33 2010 -0600
@@ -154,7 +154,7 @@
                 break # no merge needed, quit early
             c2 = ctx(of, m2[of])
             cr = related(oc, c2, ca.rev())
-            if cr and (cr.path() == f or cr.path == c2.path()): # non-divergent
+            if of == f or of == c2.path(): # non-divergent
                 copy[f] = of
                 of = None
                 break
mercurial