Show More
@@ -722,7 +722,7 def extsetup(ui): | |||
|
722 | 722 | revsetpredicate.setup() |
|
723 | 723 | templatekw.keywords['transplanted'] = kwtransplanted |
|
724 | 724 | cmdutil.unfinishedstates.append( |
|
725 |
[' |
|
|
725 | ['transplant/journal', True, False, _('transplant in progress'), | |
|
726 | 726 | _("use 'hg transplant --continue' or 'hg update' to abort")]) |
|
727 | 727 | |
|
728 | 728 | # tell hggettext to extract docstrings from these functions: |
@@ -464,6 +464,10 test multiple revisions and --continue | |||
|
464 | 464 | patch failed to apply |
|
465 | 465 | abort: fix up the working directory and run hg transplant --continue |
|
466 | 466 | [255] |
|
467 | $ hg transplant 1:3 | |
|
468 | abort: transplant in progress | |
|
469 | (use 'hg transplant --continue' or 'hg update' to abort) | |
|
470 | [255] | |
|
467 | 471 | $ echo fixed > baz |
|
468 | 472 | $ hg transplant --continue |
|
469 | 473 | 9d6d6b5a8275 transplanted as d80c49962290 |
General Comments 0
You need to be logged in to leave comments.
Login now