Revert unrelated changes in previous commit

mercurial/localrepo.py

@@ -1108,10 +1108,12 b' class localrepository:'
                     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)
 

tests/test-tag.out

@@ -16,5 +16,6 b' user: test'
 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