Mercurial > hg-stable

changeset 650:2c934c7b79dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix bug in reverting deleted files -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix bug in reverting deleted files Force updates and reverts wouldn't restore deleted files in the working dir. This should fix that. manifest hash: e14809399bbc63da42e8c8f694cc8acf31e537f7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzjOJywK+sNU5EO8RAqVLAKCC1BF6JhNiO6n4LJGvy9RBTgOelwCdF9Tr sADRnovYt9xSnUGmd1Om9JQ= =SdcP -----END PGP SIGNATURE-----
author Matt Mackall <mpm@selenic.com>
date Fri, 08 Jul 2005 00:04:25 -0800
parents a7e267222864
children 08b65d66f3e7
files mercurial/hg.py
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hg.py	Thu Jul 07 09:41:03 2005 -0800
+++ b/mercurial/hg.py	Fri Jul 08 00:04:25 2005 -0800
@@ -1263,6 +1263,8 @@
         # resolve the manifest to determine which files
         # we care about merging
         self.ui.note("resolving manifests\n")
+        self.ui.debug(" force %s allow %s moddirstate %s linear %s\n" %
+                      (force, allow, moddirstate, linear_path))
         self.ui.debug(" ancestor %s local %s remote %s\n" %
                       (short(man), short(m1n), short(m2n)))
 
@@ -1380,6 +1382,8 @@
                 get[f] = n
             else:
                 self.ui.debug("local deleted %s\n" % f)
+                if force:
+                    get[f] = n
 
         del mw, m1, m2, ma