# HG changeset patch
# User mpm@selenic.com
# Date 1126639368 18000
# Node ID 9ee8428d84a10b67fa5cf974fb852be7812148ef
# Parent  5381b0d88e9e31cf125383b0250dba9f1fa19802
Revert unrelated changes in previous commit



diff -r 5381b0d88e9e -r 9ee8428d84a1 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Tue Sep 13 14:18:18 2005 -0500
+++ b/mercurial/localrepo.py	Tue Sep 13 14:22:48 2005 -0500
@@ -1108,10 +1108,12 @@
                     self.ui.debug("other deleted %s\n" % f)
                     remove.append(f) # other deleted it
             else:
-                # file is not in ancestor or target
-                if n == m1.get(f, nullid) or force: # same as parent
-                    self.ui.debug("remote deleted %s\n" % f)
-                    remove.append(f)
+                if n == m1.get(f, nullid): # same as parent
+                    if p2 == pa: # going backwards?
+                        self.ui.debug("remote deleted %s\n" % f)
+                        remove.append(f)
+                    else:
+                        self.ui.debug("local created %s, keeping\n" % f)
                 else:
                     self.ui.debug("working dir created %s, keeping\n" % f)
 
diff -r 5381b0d88e9e -r 9ee8428d84a1 tests/test-tag.out
--- a/tests/test-tag.out	Tue Sep 13 14:18:18 2005 -0500
+++ b/tests/test-tag.out	Tue Sep 13 14:22:48 2005 -0500
@@ -16,5 +16,6 @@
 date:        Thu Jan  1 00:00:00 1970 +0000
 summary:     test
 
-abort: working copy of .hgtags is changed (please commit .hgtags manually)
+abort: working copy of .hgtags is changed!
+(please commit .hgtags manually)
 failed