Show More
@@ -90,6 +90,10 b' ensure that our shelved changes exist' | |||||
90 | a |
|
90 | a | |
91 | +a |
|
91 | +a | |
92 |
|
92 | |||
|
93 | $ hg shelve --list --addremove | |||
|
94 | abort: options '--list' and '--addremove' may not be used together | |||
|
95 | [255] | |||
|
96 | ||||
93 | delete our older shelved change |
|
97 | delete our older shelved change | |
94 |
|
98 | |||
95 | $ hg shelve -d default |
|
99 | $ hg shelve -d default | |
@@ -395,6 +399,16 b' test keep and cleanup' | |||||
395 | $ hg shelve --cleanup |
|
399 | $ hg shelve --cleanup | |
396 | $ hg shelve --list |
|
400 | $ hg shelve --list | |
397 |
|
401 | |||
|
402 | $ hg shelve --cleanup --delete | |||
|
403 | abort: options '--cleanup' and '--delete' may not be used together | |||
|
404 | [255] | |||
|
405 | $ hg shelve --cleanup --patch | |||
|
406 | abort: options '--cleanup' and '--patch' may not be used together | |||
|
407 | [255] | |||
|
408 | $ hg shelve --cleanup --message MESSAGE | |||
|
409 | abort: options '--cleanup' and '--message' may not be used together | |||
|
410 | [255] | |||
|
411 | ||||
398 | test bookmarks |
|
412 | test bookmarks | |
399 |
|
413 | |||
400 | $ hg bookmark test |
|
414 | $ hg bookmark test | |
@@ -664,4 +678,11 b' unshelve and conflicts with tracked and ' | |||||
664 | g |
|
678 | g | |
665 | $ hg shelve --delete default |
|
679 | $ hg shelve --delete default | |
666 |
|
680 | |||
|
681 | $ hg shelve --delete --stat | |||
|
682 | abort: options '--delete' and '--stat' may not be used together | |||
|
683 | [255] | |||
|
684 | $ hg shelve --delete --name NAME | |||
|
685 | abort: options '--delete' and '--name' may not be used together | |||
|
686 | [255] | |||
|
687 | ||||
667 | $ cd .. |
|
688 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now