changeset 680 | 4b7b79d2db2c |
parent 679 | c11e9a6777ae |
child 681 | 32b6bbf1c37b |
--- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -1394,9 +1394,11 @@ class localrepository: self.ui.debug("remote created %s\n" % f) get[f] = n else: - self.ui.debug("local deleted %s\n" % f) - if force: + if force or p2 == pa: # going backwards? + self.ui.debug("local deleted %s, recreating\n" % f) get[f] = n + else: + self.ui.debug("local deleted %s\n" % f) del mw, m1, m2, ma