##// END OF EJS Templates
revert: no backup for `dsadded` set...
Pierre-Yves David -
r22373:f6a1386d default
parent child Browse files
Show More
@@ -2525,7 +2525,7 b' def revert(ui, repo, ctx, parents, *pats'
2525 # Modified compared to target, local change
2525 # Modified compared to target, local change
2526 (dsmodified, actions['revert'], backup),
2526 (dsmodified, actions['revert'], backup),
2527 # Added since target
2527 # Added since target
2528 (dsadded, actions['remove'], backup),
2528 (dsadded, actions['remove'], discard),
2529 # Removed since target, before working copy parent
2529 # Removed since target, before working copy parent
2530 (removed, actions['add'], backup),
2530 (removed, actions['add'], backup),
2531 # Removed since targe, marked as such in working copy parent
2531 # Removed since targe, marked as such in working copy parent
@@ -2537,7 +2537,7 b' def revert(ui, repo, ctx, parents, *pats'
2537 (unknown, actions['unknown'], discard),
2537 (unknown, actions['unknown'], discard),
2538 )
2538 )
2539
2539
2540 needdata = ('revert', 'add', 'remove', 'undelete')
2540 needdata = ('revert', 'add', 'undelete')
2541 _revertprefetch(repo, ctx, *[actions[name][0] for name in needdata])
2541 _revertprefetch(repo, ctx, *[actions[name][0] for name in needdata])
2542
2542
2543 for abs, (rel, exact) in sorted(names.items()):
2543 for abs, (rel, exact) in sorted(names.items()):
General Comments 0
You need to be logged in to leave comments. Login now