246 f2, f, f, fmerge(f2, f, f2), False) |
246 f2, f, f, fmerge(f2, f, f2), False) |
247 else: # case 3,20 A/B/A |
247 else: # case 3,20 A/B/A |
248 act("remote moved to " + f, "m", |
248 act("remote moved to " + f, "m", |
249 f2, f, f, fmerge(f2, f, f2), True) |
249 f2, f, f, fmerge(f2, f, f2), True) |
250 elif f in ma: |
250 elif f in ma: |
251 if overwrite or backwards: |
251 if n != ma[f]: |
252 act("recreating", "g", f, m2.flags(f)) |
|
253 elif n != ma[f]: |
|
254 if repo.ui.prompt( |
252 if repo.ui.prompt( |
255 _("remote changed %s which local deleted\n" |
253 _("remote changed %s which local deleted\n" |
256 "use (c)hanged version or leave (d)eleted?") % f, |
254 "use (c)hanged version or leave (d)eleted?") % f, |
257 (_("&Changed"), _("&Deleted")), _("c")) == _("c"): |
255 (_("&Changed"), _("&Deleted")), _("c")) == _("c"): |
258 act("prompt recreating", "g", f, m2.flags(f)) |
256 act("prompt recreating", "g", f, m2.flags(f)) |