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.
Revert unrelated changes in previous commit
authormpm@selenic.com
Tue, 13 Sep 2005 14:22:48 -0500
changeset 1234 9ee8428d84a1
parent 1233 5381b0d88e9e
child 1235 5c0bd13bd771
Revert unrelated changes in previous commit
mercurial/localrepo.py file | annotate | diff | comparison | revisions
tests/test-tag.out file | annotate | diff | comparison | revisions 
--- 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)
 
--- 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
Mercurial