Show More
@@ -2521,20 +2521,20 b' def revert(ui, repo, ctx, parents, *pats' | |||
|
2521 | 2521 | |
|
2522 | 2522 | ## Sets that results that will change file on disk |
|
2523 | 2523 | # Modified compared to target, no local change |
|
2524 | (modified, actions['revert'], discard), | |
|
2524 | (modified, actions['revert'], discard), | |
|
2525 | 2525 | # Modified compared to target, local change |
|
2526 | (dsmodified, actions['revert'], backup), | |
|
2526 | (dsmodified, actions['revert'], backup), | |
|
2527 | 2527 | # Added since target |
|
2528 | (dsadded, actions['remove'], backup), | |
|
2528 | (dsadded, actions['remove'], backup), | |
|
2529 | 2529 | # Removed since target, before working copy parent |
|
2530 | (removed, actions['add'], backup), | |
|
2530 | (removed, actions['add'], backup), | |
|
2531 | 2531 | # Removed since targe, marked as such in working copy parent |
|
2532 | (dsremoved, actions['undelete'], backup), | |
|
2532 | (dsremoved, actions['undelete'], backup), | |
|
2533 | 2533 | ## the following sets does not result in any file changes |
|
2534 | 2534 | # File with no modification |
|
2535 | (clean, actions['noop'], discard), | |
|
2535 | (clean, actions['noop'], discard), | |
|
2536 | 2536 | # Existing file, not tracked anywhere |
|
2537 | (unknown, actions['unknown'], discard), | |
|
2537 | (unknown, actions['unknown'], discard), | |
|
2538 | 2538 | ) |
|
2539 | 2539 | |
|
2540 | 2540 | needdata = ('revert', 'add', 'remove', 'undelete') |
General Comments 0
You need to be logged in to leave comments.
Login now