# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1265037505 21600
# Node ID 4aa619c4c2c09907034d9824ebb1dd0e878206eb
# Parent  4a1034687ef75f41c300195387a22706a5942ec2# Parent  e7639acd54f6ac9a42c99ae8c1faed2331126900
Merge with i18n

diff -r e7639acd54f6 -r 4aa619c4c2c0 mercurial/copies.py
--- 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