Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with i18n stable 1.4.3
authorMatt Mackall <mpm@selenic.com>
Mon, 01 Feb 2010 09:18:25 -0600
branchstable
changeset 10308 4aa619c4c2c0
parent 10298 4a1034687ef7 (diff)
parent 10306 e7639acd54f6 (current diff)
child 10310 61750d3aa00c
Merge with i18n
--- a/mercurial/copies.py	Mon Feb 01 11:10:43 2010 -0200
+++ b/mercurial/copies.py	Mon Feb 01 09:18:25 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