Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 3881:c0a12e6441a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix copy detection corner case We were aborting if the copied from rev was before the cut-off limit, rather than the copied _to_ rev. The copied from rev can be arbitrarily old.
author Matt Mackall <mpm@selenic.com>
date Tue, 12 Dec 2006 17:52:33 -0600
parents 46abbed02b2d
children 1e0b94cfba0e c95060a5391a
comparison
equal deleted inserted replaced
3874:e88d03c2a3d9 3881:c0a12e6441a5
107 old = {} 107 old = {}
108 orig = fctx.path() 108 orig = fctx.path()
109 visit = [fctx] 109 visit = [fctx]
110 while visit: 110 while visit:
111 fc = visit.pop() 111 fc = visit.pop()
112 if fc.path() != orig and fc.path() not in old:
113 old[fc.path()] = 1
112 if fc.rev() < limit: 114 if fc.rev() < limit:
113 continue 115 continue
114 if fc.path() != orig and fc.path() not in old:
115 old[fc.path()] = 1
116 visit += fc.parents() 116 visit += fc.parents()
117 117
118 old = old.keys() 118 old = old.keys()
119 old.sort() 119 old.sort()
120 return old 120 return old