mercurial/merge.py
changeset 3875 c0a12e6441a5
parent 3862 46abbed02b2d
child 3876 1e0b94cfba0e
child 4115 c95060a5391a
equal deleted inserted replaced
3874:e88d03c2a3d9 3875: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