equal
deleted
inserted
replaced
767 for f, args, msg in actions.get(ACTION_FORGET, []): |
767 for f, args, msg in actions.get(ACTION_FORGET, []): |
768 repo.dirstate.drop(f) |
768 repo.dirstate.drop(f) |
769 |
769 |
770 # resolve path conflicts |
770 # resolve path conflicts |
771 for f, args, msg in actions.get(ACTION_PATH_CONFLICT_RESOLVE, []): |
771 for f, args, msg in actions.get(ACTION_PATH_CONFLICT_RESOLVE, []): |
772 (f0,) = args |
772 (f0, origf0) = args |
773 origf0 = repo.dirstate.copied(f0) or f0 |
|
774 repo.dirstate.add(f) |
773 repo.dirstate.add(f) |
775 repo.dirstate.copy(origf0, f) |
774 repo.dirstate.copy(origf0, f) |
776 if f0 == origf0: |
775 if f0 == origf0: |
777 repo.dirstate.remove(f0) |
776 repo.dirstate.remove(f0) |
778 else: |
777 else: |