Mercurial Mercurial > hg > mercurial-crew-with-dirclash / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix copy detection corner case
authorMatt Mackall <mpm@selenic.com>
Tue, 12 Dec 2006 17:52:33 -0600
changeset 3881 c0a12e6441a5
parent 3874 e88d03c2a3d9
child 3882 daa42bac8611
child 3885 1e0b94cfba0e
Fix copy detection corner case We were aborting if the copied from rev was before the cut-off limit, rather than the copied _to_ rev. The copied from rev can be arbitrarily old.
mercurial/merge.py file | annotate | diff | comparison | revisions 
old mode 100755
new mode 100644
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -109,10 +109,10 @@ def findcopies(repo, m1, m2, ma, limit):
         visit = [fctx]
         while visit:
             fc = visit.pop()
+            if fc.path() != orig and fc.path() not in old:
+                old[fc.path()] = 1
             if fc.rev() < limit:
                 continue
-            if fc.path() != orig and fc.path() not in old:
-                old[fc.path()] = 1
             visit += fc.parents()
 
         old = old.keys()
mercurial-crew-with-dirclash