# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1121123192 28800
# Node ID 4b7b79d2db2c46981e0a7319cc40c7fc35bae257
# Parent  c11e9a6777aeb4704324ce68e3ae273f9043acf7
Handle undeletion of files when checking out old revisions

Spotted by Marc Singer



diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -1394,9 +1394,11 @@ class localrepository:
                 self.ui.debug("remote created %s\n" % f)
                 get[f] = n
             else:
-                self.ui.debug("local deleted %s\n" % f)
-                if force:
+                if force or p2 == pa: # going backwards?
+                    self.ui.debug("local deleted %s, recreating\n" % f)
                     get[f] = n
+                else:
+                    self.ui.debug("local deleted %s\n" % f)
 
         del mw, m1, m2, ma