Show More
@@ -628,7 +628,7 b' def _dounshelve(ui, repo, *shelved, **op' | |||
|
628 | 628 | except IOError as err: |
|
629 | 629 | if err.errno != errno.ENOENT: |
|
630 | 630 | raise |
|
631 | raise error.Abort(_('no unshelve operation underway')) | |
|
631 | cmdutil.wrongtooltocontinue(repo, _('unshelve')) | |
|
632 | 632 | |
|
633 | 633 | if abortf: |
|
634 | 634 | return unshelveabort(ui, repo, state, opts) |
@@ -373,7 +373,7 b' abort the unshelve and be happy' | |||
|
373 | 373 | try to continue with no unshelve underway |
|
374 | 374 | |
|
375 | 375 | $ hg unshelve -c |
|
376 |
abort: no unshelve |
|
|
376 | abort: no unshelve in progress | |
|
377 | 377 | [255] |
|
378 | 378 | $ hg status |
|
379 | 379 | A foo/foo |
@@ -403,6 +403,10 b' attempt to continue' | |||
|
403 | 403 | (use 'hg unshelve --continue' or 'hg unshelve --abort') |
|
404 | 404 | [255] |
|
405 | 405 | |
|
406 | $ hg graft --continue | |
|
407 | abort: no graft in progress | |
|
408 | (continue: hg unshelve --continue) | |
|
409 | [255] | |
|
406 | 410 | $ hg unshelve -c |
|
407 | 411 | rebasing 5:32c69314e062 "changes to: [mq]: second.patch" (tip) |
|
408 | 412 | unshelve of 'default' complete |
General Comments 0
You need to be logged in to leave comments.
Login now