Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/hg.py
changeset 383 4862a134e2c2
parent 377 e5d769afd3ef
child 385 e9e1efd5291c 
--- a/mercurial/hg.py	Thu Jun 16 08:37:15 2005 -0800
+++ b/mercurial/hg.py	Thu Jun 16 22:32:55 2005 -0800
@@ -1076,7 +1076,11 @@
                     remove.append(f) # other deleted it
             else:
                 if n == m1.get(f, nullid): # same as parent
-                    self.ui.debug("local created %s, keeping\n" % f)
+                    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)
mercurial