Mercurial > hg > mercurial-crew-with-dirclash

changeset 3882:daa42bac8611

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with hg-stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 14 Dec 2006 19:10:05 +0100
parents 9c8488490724 (current diff) c0a12e6441a5 (diff)
children 6081b4c68baf
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
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()