--- a/mercurial/merge.py Sun Sep 17 20:00:14 2006 -0500
+++ b/mercurial/merge.py Sun Sep 17 20:10:54 2006 -0500
@@ -175,17 +175,15 @@
for f, n in m2.iteritems():
if f in ma:
- if n != ma[f]:
- r = _("k")
- if not overwrite:
- r = ui.prompt(
- (_("remote changed %s which local deleted\n") % f) +
- _("(k)eep or (d)elete?"), _("[kd]"), _("k"))
+ if overwrite or backwards:
+ ui.debug(_("local deleted %s, recreating\n") % f)
+ action.append((f, "g", m2.execf(f), n))
+ elif n != ma[f]:
+ r = ui.prompt(
+ (_("remote changed %s which local deleted\n") % f) +
+ _("(k)eep or (d)elete?"), _("[kd]"), _("k"))
if r == _("k"):
action.append((f, "g", m2.execf(f), n))
- elif overwrite or backwards:
- ui.debug(_("local deleted %s, recreating\n") % f)
- action.append((f, "g", m2.execf(f), n))
else:
ui.debug(_("local deleted %s\n") % f)
else: