Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with hg-stable
authorThomas Arendsen Hein <thomas@intevation.de>
Thu, 14 Dec 2006 19:10:05 +0100
changeset 3884 daa42bac8611
parent 3882 9c8488490724 (current diff)
parent 3875 c0a12e6441a5 (diff)
child 3885 6081b4c68baf
merge with hg-stable
--- 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()
Mercurial