changeset 3875 | c0a12e6441a5 |
parent 3862 | 46abbed02b2d |
child 3876 | 1e0b94cfba0e |
child 4115 | c95060a5391a |
--- a/mercurial/merge.py Tue Dec 12 12:40:51 2006 -0800 +++ b/mercurial/merge.py Tue Dec 12 17:52:33 2006 -0600 @@ -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()