--- a/tests/test-obsolete.t	Tue Apr 24 15:57:48 2012 +0200
+++ b/tests/test-obsolete.t	Tue Apr 24 16:30:58 2012 +0200
@@ -4,8 +4,6 @@
   > allow_push = *
   > [phases]
   > publish=False
-  > [obsolete]
-  > secret-unstable=no
   > [alias]
   > odiff=diff --rev 'limit(obsparents(.),1)' --rev .
   > [extensions]
@@ -117,7 +115,13 @@
 
   $ hg init ../other-new
   $ hg phase --draft 'secret() - extinct()' # until we fix exclusion
-  $ hg push --traceback ../other-new
+  $ hg push ../other-new
+  pushing to ../other-new
+  searching for changes
+  abort: Trying to push unstable changeset: a7a6f2b5d8a5!
+  (use 'hg stabilize' to get a stable history (or --force to proceed))
+  [255]
+  $ hg push -f ../other-new
   pushing to ../other-new
   searching for changes
   adding changesets
@@ -163,7 +167,13 @@
   $ qlog -r 'obsolete()'
   3
   - 0d3f46688ccc
-  $ hg push ../other-new -f # XXX should not have to use -f
+  $ hg push ../other-new
+  pushing to ../other-new
+  searching for changes
+  abort: Trying to push unstable changeset: 95de7fc6918d!
+  (use 'hg stabilize' to get a stable history (or --force to proceed))
+  [255]
+  $ hg push ../other-new -f # use f because there is unstability
   pushing to ../other-new
   searching for changes
   adding changesets
@@ -228,6 +238,12 @@
   $ hg push ../other-old
   pushing to ../other-old
   searching for changes
+  abort: Trying to push unstable changeset: 909a0fb57e5d!
+  (use 'hg stabilize' to get a stable history (or --force to proceed))
+  [255]
+  $ hg push -f ../other-old
+  pushing to ../other-old
+  searching for changes
   adding changesets
   adding manifests
   adding file changes