Mercurial > public > mercurial-scm > hg-stable

diff mercurial/copies.py @ 12683:ada47c38f4e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: don't detect copies as "divergent renames" (For the purposes of this patch copy is defined as a rename where the source continues to exist.)
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Sun, 10 Oct 2010 09:48:37 -0500
parents 4f11978ae45d
children a8d13ee0ce68
line wrap: on
line diff
--- a/mercurial/copies.py	Sat Oct 09 11:02:11 2010 -0500
+++ b/mercurial/copies.py	Sun Oct 10 09:48:37 2010 -0500
@@ -195,8 +195,8 @@
 
     diverge2 = set()
     for of, fl in diverge.items():
-        if len(fl) == 1:
-            del diverge[of] # not actually divergent
+        if len(fl) == 1 or of in c2:
+            del diverge[of] # not actually divergent, or not a rename
         else:
             diverge2.update(fl) # reverse map for below