--- a/tests/test-mq-safety.t Fri Jan 20 00:27:11 2012 +0100
+++ b/tests/test-mq-safety.t Fri Jan 20 18:45:29 2012 +0100
@@ -144,7 +144,18 @@
Pushing applied patch with --rev without --force
- $ hg push -r default ../forcepush2
+All secret
+
+ $ hg push -r . ../forcepush2
+ pushing to ../forcepush2
+ searching for changes
+ no changes to push but 1 secret changesets
+
+some draft
+
+ $ hg phase --draft 'mq()'
+
+ $ hg push -r . ../forcepush2
pushing to ../forcepush2
abort: source has mq patches applied
[255]
@@ -168,11 +179,12 @@
Pushing applied patch with --force
+ $ hg phase --force --secret 'mq()'
$ hg push --force -r default ../forcepush2
pushing to ../forcepush2
searching for changes
no changes to push but 1 secret changesets
- $ hg phase -d 'mq()'
+ $ hg phase --draft 'mq()'
$ hg push --force -r default ../forcepush2
pushing to ../forcepush2
searching for changes