# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1166119805 -3600
# Node ID daa42bac86114282cc4da6d13cda81a260a0646a
# Parent  9c84884907243f6824d93a8bda7e844ebc8315ad# Parent  c0a12e6441a5abb669fcd62cc9719220c255fcd5
merge with hg-stable

diff -r 9c8488490724 -r daa42bac8611 mercurial/merge.py
--- a/mercurial/merge.py	Thu Dec 14 16:07:29 2006 +0100
+++ b/mercurial/merge.py	Thu Dec 14 19:10:05 2006 +0100
@@ -109,10 +109,10 @@
         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()