equal
deleted
inserted
replaced
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) |