363 if m == "cd": |
363 if m == "cd": |
364 if acceptremote: |
364 if acceptremote: |
365 actions.append((f, "r", None, "remote delete")) |
365 actions.append((f, "r", None, "remote delete")) |
366 elif repo.ui.promptchoice( |
366 elif repo.ui.promptchoice( |
367 _("local changed %s which remote deleted\n" |
367 _("local changed %s which remote deleted\n" |
368 "use (c)hanged version or (d)elete?") % f, |
368 "use (c)hanged version or (d)elete?" |
369 (_("&Changed"), _("&Delete")), 0): |
369 "$$ &Changed $$ &Delete") % f, 0): |
370 actions.append((f, "r", None, "prompt delete")) |
370 actions.append((f, "r", None, "prompt delete")) |
371 else: |
371 else: |
372 actions.append((f, "a", None, "prompt keep")) |
372 actions.append((f, "a", None, "prompt keep")) |
373 elif m == "dc": |
373 elif m == "dc": |
374 if acceptremote: |
374 if acceptremote: |
375 actions.append((f, "g", (m2.flags(f),), "remote recreating")) |
375 actions.append((f, "g", (m2.flags(f),), "remote recreating")) |
376 elif repo.ui.promptchoice( |
376 elif repo.ui.promptchoice( |
377 _("remote changed %s which local deleted\n" |
377 _("remote changed %s which local deleted\n" |
378 "use (c)hanged version or leave (d)eleted?") % f, |
378 "use (c)hanged version or leave (d)eleted?" |
379 (_("&Changed"), _("&Deleted")), 0) == 0: |
379 "$$ &Changed $$ &Deleted") % f, 0) == 0: |
380 actions.append((f, "g", (m2.flags(f),), "prompt recreating")) |
380 actions.append((f, "g", (m2.flags(f),), "prompt recreating")) |
381 else: assert False, m |
381 else: assert False, m |
382 return actions |
382 return actions |
383 |
383 |
384 def actionkey(a): |
384 def actionkey(a): |