# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2006-12-12 23:52:33
# Node ID c0a12e6441a5abb669fcd62cc9719220c255fcd5
# Parent  e88d03c2a3d95ae6865749e3686e1786e15a3505

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.

diff --git a/mercurial/merge.py b/mercurial/merge.py
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()