--- a/tests/test-evolve.t	Fri Jan 04 12:42:43 2013 +0100
+++ b/tests/test-evolve.t	Fri Jan 04 12:43:22 2013 +0100
@@ -233,17 +233,13 @@
 
   $ hg phase --public 0 -v
   phase changed for 1 changesets
-  $ hg amend -c 2
+  $ hg amend -c 4
   abort: cannot amend non ancestor changeset
   [255]
 
 
 (amend of on ancestors)
 
-  $ hg amend -c 2
-  abort: cannot amend non ancestor changeset
-  [255]
-
   $ hg amend --note 'french looks better'
   1 new unstable changesets
   $ hg log
@@ -298,7 +294,7 @@
 
 phase change turning obsolete changeset public issue a bumped warning
 
-  $ hg phase --public 7
+  $ hg phase --hidden --public 7
   1 new bumped changesets
 
 all solving bumped troubled
@@ -326,7 +322,7 @@
   |
   o  0	: base - test
   
-  $ hg diff -r 9 -r 8
+  $ hg diff --hidden -r 9 -r 8
   $ hg diff -r 9^ -r 9
   diff --git a/main-file-1 b/main-file-1
   --- a/main-file-1
@@ -393,6 +389,9 @@
   checking files
   3 files, 4 changesets, 4 total revisions
   $ hg --config extensions.hgext.mq= strip 'extinct()'
+  abort: empty revision set
+  [255]
+  $ hg --config extensions.hgext.mq= strip --hidden 'extinct()'
   saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-backup.hg
   $ hg verify
   checking changesets