--- a/tests/test-shelve.t Sun Jun 01 00:08:33 2014 +0900
+++ b/tests/test-shelve.t Thu Jun 05 22:20:32 2014 +0900
@@ -90,6 +90,10 @@
a
+a
+ $ hg shelve --list --addremove
+ abort: options '--list' and '--addremove' may not be used together
+ [255]
+
delete our older shelved change
$ hg shelve -d default
@@ -395,6 +399,16 @@
$ hg shelve --cleanup
$ hg shelve --list
+ $ hg shelve --cleanup --delete
+ abort: options '--cleanup' and '--delete' may not be used together
+ [255]
+ $ hg shelve --cleanup --patch
+ abort: options '--cleanup' and '--patch' may not be used together
+ [255]
+ $ hg shelve --cleanup --message MESSAGE
+ abort: options '--cleanup' and '--message' may not be used together
+ [255]
+
test bookmarks
$ hg bookmark test
@@ -664,4 +678,11 @@
g
$ hg shelve --delete default
+ $ hg shelve --delete --stat
+ abort: options '--delete' and '--stat' may not be used together
+ [255]
+ $ hg shelve --delete --name NAME
+ abort: options '--delete' and '--name' may not be used together
+ [255]
+
$ cd ..