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