hgext/mq.py
branchstable
changeset 12344 b6173aee4a47
parent 12067 a4fbbe0fbc38
child 12345 e0ee3e822a9a
child 12352 5be733b20bd1
equal deleted inserted replaced
12343:28642f7fc2cf 12344:b6173aee4a47
   672             if merge and files:
   672             if merge and files:
   673                 # Mark as removed/merged and update dirstate parent info
   673                 # Mark as removed/merged and update dirstate parent info
   674                 removed = []
   674                 removed = []
   675                 merged = []
   675                 merged = []
   676                 for f in files:
   676                 for f in files:
   677                     if os.path.exists(repo.wjoin(f)):
   677                     if os.path.lexists(repo.wjoin(f)):
   678                         merged.append(f)
   678                         merged.append(f)
   679                     else:
   679                     else:
   680                         removed.append(f)
   680                         removed.append(f)
   681                 for f in removed:
   681                 for f in removed:
   682                     repo.dirstate.remove(f)
   682                     repo.dirstate.remove(f)