diff -r 2ac08d8b21aa -r ad394c897b16 mercurial/copies.py
--- a/mercurial/copies.py	Tue May 22 14:37:20 2012 -0500
+++ b/mercurial/copies.py	Wed May 23 17:25:48 2012 +0200
@@ -285,7 +285,7 @@
 
     diverge2 = set()
     for of, fl in diverge.items():
-        if len(fl) == 1 or of in c2:
+        if len(fl) == 1 or of in c1 or of in c2:
             del diverge[of] # not actually divergent, or not a rename
         else:
             diverge2.update(fl) # reverse map for below