# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1264967013 21600
# Node ID 00099580ca35d7767a88e851400d4b44f21c7543
# Parent  56b50194617f68618158e02b26e220ee87e6bcf4# Parent  4a1034687ef75f41c300195387a22706a5942ec2
Merge with stable

diff -r 56b50194617f -r 00099580ca35 mercurial/copies.py
--- 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