Mercurial > hg
comparison tests/test-shelve.t @ 28124:983365382465
shelve: suggest the correct tool to continue (not unshelve)
Suggest committing (or whatever the current activity is), via
wrongtooltocontinue which uses howtocontinue.
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Thu, 04 Feb 2016 03:47:38 +0000 |
| parents | 158bdc896572 |
| children | 3f0e25e89e28 |
comparison
equal
deleted
inserted
replaced
| 28123:6c1b7f80f90f | 28124:983365382465 |
|---|---|
| 371 ? a/a.orig | 371 ? a/a.orig |
| 372 | 372 |
| 373 try to continue with no unshelve underway | 373 try to continue with no unshelve underway |
| 374 | 374 |
| 375 $ hg unshelve -c | 375 $ hg unshelve -c |
| 376 abort: no unshelve operation underway | 376 abort: no unshelve in progress |
| 377 [255] | 377 [255] |
| 378 $ hg status | 378 $ hg status |
| 379 A foo/foo | 379 A foo/foo |
| 380 ? a/a.orig | 380 ? a/a.orig |
| 381 | 381 |
| 401 $ hg commit -m 'commit while unshelve in progress' | 401 $ hg commit -m 'commit while unshelve in progress' |
| 402 abort: unshelve already in progress | 402 abort: unshelve already in progress |
| 403 (use 'hg unshelve --continue' or 'hg unshelve --abort') | 403 (use 'hg unshelve --continue' or 'hg unshelve --abort') |
| 404 [255] | 404 [255] |
| 405 | 405 |
| 406 $ hg graft --continue | |
| 407 abort: no graft in progress | |
| 408 (continue: hg unshelve --continue) | |
| 409 [255] | |
| 406 $ hg unshelve -c | 410 $ hg unshelve -c |
| 407 rebasing 5:32c69314e062 "changes to: [mq]: second.patch" (tip) | 411 rebasing 5:32c69314e062 "changes to: [mq]: second.patch" (tip) |
| 408 unshelve of 'default' complete | 412 unshelve of 'default' complete |
| 409 | 413 |
| 410 ensure the repo is as we hope | 414 ensure the repo is as we hope |