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-----
--- 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