# HG changeset patch
# User mpm@selenic.com
# Date 1118822959 28800
# Node ID db419f14df4b96d4e016b869e5d9ebe8655c7f6d
# Parent  d7df759d0e97f3980283eb3d6fb0d72910daaee5
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-----


diff -r d7df759d0e97 -r db419f14df4b mercurial/hg.py
--- 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)