equal
deleted
inserted
replaced
276 default.patch |
276 default.patch |
277 default.shelve |
277 default.shelve |
278 |
278 |
279 $ hg unshelve |
279 $ hg unshelve |
280 abort: no shelved changes to apply! |
280 abort: no shelved changes to apply! |
281 [255] |
281 [20] |
282 $ hg unshelve foo |
282 $ hg unshelve foo |
283 abort: shelved change 'foo' not found |
283 abort: shelved change 'foo' not found |
284 [255] |
284 [10] |
285 |
285 |
286 named shelves, specific filenames, and "commit messages" should all work |
286 named shelves, specific filenames, and "commit messages" should all work |
287 (this tests also that editor is invoked, if '--edit' is specified) |
287 (this tests also that editor is invoked, if '--edit' is specified) |
288 |
288 |
289 $ hg status -C |
289 $ hg status -C |
977 |
977 |
978 $ hg shelve --list |
978 $ hg shelve --list |
979 default (*s ago) changes to: create conflict (glob) |
979 default (*s ago) changes to: create conflict (glob) |
980 $ hg shelve --delete doesnotexist |
980 $ hg shelve --delete doesnotexist |
981 abort: shelved change 'doesnotexist' not found |
981 abort: shelved change 'doesnotexist' not found |
982 [255] |
982 [10] |
983 $ hg shelve --delete default |
983 $ hg shelve --delete default |
984 |
984 |
985 $ cd .. |
985 $ cd .. |
986 |
986 |
987 Test visibility of in-memory changes inside transaction to external hook |
987 Test visibility of in-memory changes inside transaction to external hook |
1406 continue: hg unshelve --continue |
1406 continue: hg unshelve --continue |
1407 |
1407 |
1408 -- using --continue with --interactive should throw an error |
1408 -- using --continue with --interactive should throw an error |
1409 $ hg unshelve --continue -i |
1409 $ hg unshelve --continue -i |
1410 abort: cannot use both continue and interactive |
1410 abort: cannot use both continue and interactive |
1411 [255] |
1411 [10] |
1412 |
1412 |
1413 $ cat bar1 |
1413 $ cat bar1 |
1414 A |
1414 A |
1415 B |
1415 B |
1416 C |
1416 C |
1509 (enter ? for help) [Ynesfdaq?] y |
1509 (enter ? for help) [Ynesfdaq?] y |
1510 |
1510 |
1511 -- test for --interactive --keep |
1511 -- test for --interactive --keep |
1512 $ hg unshelve -i --keep |
1512 $ hg unshelve -i --keep |
1513 abort: --keep on --interactive is not yet supported |
1513 abort: --keep on --interactive is not yet supported |
1514 [255] |
1514 [10] |
1515 |
1515 |
1516 $ hg update -q --clean . |
1516 $ hg update -q --clean . |
1517 |
1517 |
1518 Test that we can successfully shelve and unshelve a file with a trailing space |
1518 Test that we can successfully shelve and unshelve a file with a trailing space |
1519 in the filename. Such filenames are supposedly unsupported on Windows, so we |
1519 in the filename. Such filenames are supposedly unsupported on Windows, so we |