Show More
@@ -915,7 +915,7 b' def restorestatus(repo):' | |||
|
915 | 915 | except IOError as err: |
|
916 | 916 | if err.errno != errno.ENOENT: |
|
917 | 917 | raise |
|
918 | raise error.Abort(_('no rebase in progress')) | |
|
918 | cmdutil.wrongtooltocontinue(repo, _('rebase')) | |
|
919 | 919 | |
|
920 | 920 | if keepbranches is None: |
|
921 | 921 | raise error.Abort(_('.hg/rebasestate is incomplete')) |
@@ -481,6 +481,10 b' Test --tool parameter:' | |||
|
481 | 481 | $ hg resolve -m c2 |
|
482 | 482 | (no more unresolved files) |
|
483 | 483 | continue: hg rebase --continue |
|
484 | $ hg graft --continue | |
|
485 | abort: no graft in progress | |
|
486 | (continue: hg rebase --continue) | |
|
487 | [255] | |
|
484 | 488 | $ hg rebase -c --tool internal:fail |
|
485 | 489 | rebasing 2:e4e3f3546619 "c2b" (tip) |
|
486 | 490 | note: rebase of 2:e4e3f3546619 created no changes to commit |
General Comments 0
You need to be logged in to leave comments.
Login now