Mercurial > hg

changeset 10308:4aa619c4c2c0 stable 1.4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with i18n
author Matt Mackall <mpm@selenic.com>
date Mon, 01 Feb 2010 09:18:25 -0600
parents 4a1034687ef7 (diff) e7639acd54f6 (current diff)
children 61750d3aa00c
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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