Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/cmdutil.py
changeset 22373 f6a1386d540e
parent 22372 8da5864dcfda
child 22374 4509a16c76c2 
--- a/mercurial/cmdutil.py	Sat Aug 30 16:06:09 2014 +0200
+++ b/mercurial/cmdutil.py	Sat Aug 30 01:49:28 2014 +0200
@@ -2525,7 +2525,7 @@
             # 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
@@ -2537,7 +2537,7 @@
             (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()):
mercurial