equal
deleted
inserted
replaced
3684 for f in actions[b'add'][0]: |
3684 for f in actions[b'add'][0]: |
3685 # Don't checkout modified files, they are already created by the diff |
3685 # Don't checkout modified files, they are already created by the diff |
3686 if f not in newlyaddedandmodifiedfiles: |
3686 if f not in newlyaddedandmodifiedfiles: |
3687 prntstatusmsg(b'add', f) |
3687 prntstatusmsg(b'add', f) |
3688 checkout(f) |
3688 checkout(f) |
3689 repo.dirstate.add(f) |
3689 repo.dirstate.set_tracked(f) |
3690 |
3690 |
3691 normal = repo.dirstate.normallookup |
3691 normal = repo.dirstate.normallookup |
3692 if node == parent and p2 == repo.nullid: |
3692 if node == parent and p2 == repo.nullid: |
3693 normal = repo.dirstate.normal |
3693 normal = repo.dirstate.normal |
3694 for f in actions[b'undelete'][0]: |
3694 for f in actions[b'undelete'][0]: |