diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -1076,7 +1076,11 @@ class localrepository: 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)