[PATCH 2 of 2] revert: save backup of undeleted files (issue3422)

[Kevin Bullock]

# HG changeset patch
# User Kevin Bullock <kbullock at ringworld.org>
# Date 1336141869 18000
# Branch stable
# Node ID a5119c4fa009c415ad398d84bc89669aa3ca1f80
# Parent  e19cb9f091f89a90afffcc57935b86aac0689437
revert: save backup of undeleted files (issue3422)

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -1528,7 +1528,7 @@ def revert(ui, repo, ctx, parents, *pats
             #   make backup if not in target manifest
             (modified, revert, remove, True, True),
             (added, revert, remove, True, False),
-            (removed, undelete, None, False, False),
+            (removed, undelete, None, True, False),
             (deleted, revert, remove, False, False),
             )
 
diff --git a/tests/test-revert.t b/tests/test-revert.t
--- a/tests/test-revert.t
+++ b/tests/test-revert.t
@@ -98,6 +98,16 @@ should verbosely save backup to e.orig
   saving current version of e as e.orig
   reverting e
 
+Issue3422: should save backup when reverting after forget
+
+  $ echo a >> a
+  $ hg forget a
+  $ hg st a
+  R a
+  $ hg revert -v a
+  saving current version of a as a.orig
+  undeleting a
+
 should say no changes needed
 
   $ hg revert a
@@ -120,9 +130,8 @@ should say file not found
   $ hg commit -m "second"
   $ echo z > z
   $ hg add z
-  $ hg st
+  $ hg st z
   A z
-  ? e.orig
 
 should add a, remove d, forget z