Mercurial > hg

changeset 10302:00099580ca35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Matt Mackall <mpm@selenic.com>
date Sun, 31 Jan 2010 13:43:33 -0600
parents 56b50194617f (current diff) 4a1034687ef7 (diff)
children 0df9e63f0c07 31141fd7c9cc
files mercurial/copies.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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