Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 4356:10edaed7f909
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 16 Apr 2007 12:37:30 -0500 |
parents | 09c5f734ff6a 8aee687f0214 |
children | 47371e1c1db4 |
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: