# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1265097920 -3600
# Node ID 31141fd7c9cc911552906dd0cfe8012e30582445
# Parent  00099580ca35d7767a88e851400d4b44f21c7543
copies: check if revisions are related (bug found with pylint)

diff -r 00099580ca35 -r 31141fd7c9cc mercurial/copies.py
--- a/mercurial/copies.py	Sun Jan 31 13:43:33 2010 -0600
+++ b/mercurial/copies.py	Tue Feb 02 09:05:20 2010 +0100
@@ -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 (of == f or of == c2.path()): # non-divergent
                 copy[f] = of
                 of = None
                 break