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.
copies: fix issue1994 stable
authorMatt Mackall <mpm@selenic.com>
Thu, 28 Jan 2010 22:45:46 -0600
branchstable
changeset 10294 d1cd09bb4d18
parent 10284 b08ffd27dfc8
child 10295 44c923eeb81d
copies: fix issue1994 Unscramble divergence test
mercurial/copies.py file | annotate | diff | comparison | revisions 
--- a/mercurial/copies.py	Thu Jan 28 11:27:09 2010 +0000
+++ b/mercurial/copies.py	Thu Jan 28 22:45:46 2010 -0600
@@ -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 (cr.path() == f or cr.path == c2.path()): # non-divergent
                 copy[f] = of
                 of = None
                 break
Mercurial