@@ -2523,11 +2523,11 @@ def revert(ui, repo, ctx, parents, *pats
# Modified compared to target, no local change
(modified, actions['revert'], discard),
# Modified compared to target, local change
(dsmodified, actions['revert'], backup),
# Added since target
- (dsadded, actions['remove'], backup),
+ (dsadded, actions['remove'], discard),
# Removed since target, before working copy parent
(removed, actions['add'], backup),
# Removed since targe, marked as such in working copy parent
(dsremoved, actions['undelete'], backup),
## the following sets does not result in any file changes
@@ -2535,11 +2535,11 @@ def revert(ui, repo, ctx, parents, *pats
(clean, actions['noop'], discard),
# Existing file, not tracked anywhere
(unknown, actions['unknown'], discard),
)
- needdata = ('revert', 'add', 'remove', 'undelete')
+ needdata = ('revert', 'add', 'undelete')
_revertprefetch(repo, ctx, *[actions[name][0] for name in needdata])
for abs, (rel, exact) in sorted(names.items()):
# target file to be touch on disk (relative to cwd)
target = repo.wjoin(abs)