Mercurial > hg > mercurial-crew-with-dirclash

changeset 4355:c3c53eb44611

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
author Matt Mackall <mpm@selenic.com>
date Mon, 16 Apr 2007 12:27:49 -0500
parents 8aee687f0214 (diff) 5e857d72d3ac (current diff)
children 10edaed7f909 aed9e6dceb85
files
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -105,10 +105,15 @@ def findcopies(repo, m1, m2, ma, limit):
     def findold(fctx):
         "find files that path was copied from, back to linkrev limit"
         old = {}
+        seen = {}
         orig = fctx.path()
         visit = [fctx]
         while visit:
             fc = visit.pop()
+            s = str(fc)
+            if s in seen:
+                continue
+            seen[s] = 1
             if fc.path() != orig and fc.path() not in old:
                 old[fc.path()] = 1
             if fc.rev() < limit: