Mercurial > hg-stable

changeset 10294:d1cd09bb4d18 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: fix issue1994 Unscramble divergence test
author Matt Mackall <mpm@selenic.com>
date Thu, 28 Jan 2010 22:45:46 -0600
parents b08ffd27dfc8
children 44c923eeb81d
files mercurial/copies.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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