equal
deleted
inserted
replaced
3747 if normal: |
3747 if normal: |
3748 normal(f) |
3748 normal(f) |
3749 |
3749 |
3750 for f in actions[b'add'][0]: |
3750 for f in actions[b'add'][0]: |
3751 # Don't checkout modified files, they are already created by the diff |
3751 # Don't checkout modified files, they are already created by the diff |
3752 if f not in newlyaddedandmodifiedfiles: |
3752 if f in newlyaddedandmodifiedfiles: |
3753 prntstatusmsg(b'add', f) |
3753 continue |
3754 checkout(f) |
3754 |
3755 repo.dirstate.set_tracked(f) |
3755 prntstatusmsg(b'add', f) |
|
3756 checkout(f) |
|
3757 repo.dirstate.set_tracked(f) |
3756 |
3758 |
3757 for f in actions[b'undelete'][0]: |
3759 for f in actions[b'undelete'][0]: |
3758 if interactive: |
3760 if interactive: |
3759 choice = repo.ui.promptchoice( |
3761 choice = repo.ui.promptchoice( |
3760 _(b"add back removed file %s (Yn)?$$ &Yes $$ &No") % f |
3762 _(b"add back removed file %s (Yn)?$$ &Yes $$ &No") % f |