Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix yet another resolve corner case
authormpm@selenic.com
Wed, 15 Jun 2005 00:09:19 -0800
changeset 344 db419f14df4b
parent 343 d7df759d0e97
child 345 9d8d9207c0b3
Fix yet another resolve corner case -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix yet another resolve corner case manifest hash: a194321b5cd718a3c31f327c5145a4ebd8dd4ef4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr+IvywK+sNU5EO8RAt49AJwLBBq7AZfo1WqcwZvzSVENvJGLmgCePumQ 0/9RwjL/PorsvFJi+CiFYyY= =S6HA -----END PGP SIGNATURE-----
mercurial/hg.py file | annotate | diff | comparison | revisions 
--- a/mercurial/hg.py	Wed Jun 15 00:08:03 2005 -0800
+++ b/mercurial/hg.py	Wed Jun 15 00:09:19 2005 -0800
@@ -1024,8 +1024,7 @@
                     remove.append(f) # other deleted it
             else:
                 if n == m1.get(f, nullid): # same as parent
-                    self.ui.debug("remote deleted %s\n" % f)
-                    remove.append(f)
+                    self.ui.debug("local created %s, keeping\n" % f)
                 else:
                     self.ui.debug("working dir created %s, keeping\n" % f)
Mercurial