--- a/tests/test-stabilize-result.t	Sun Dec 02 16:21:19 2012 +0100
+++ b/tests/test-stabilize-result.t	Mon Dec 03 00:10:58 2012 +0100
@@ -130,7 +130,7 @@
 
 Make precursors public
 
-  $ hg phase --public 8
+  $ hg phase --hidden --public 8
   1 new bumped changesets
   $ glog
   @  12:15c83af6f3a3@default(draft) bk:[] newer a
@@ -186,7 +186,6 @@
   > conflict
   > EOF
   $ hg ci -m 'More addition'
-  created new head
   $ glog
   @  15:7391601a4bfa@default(draft) bk:[] More addition
   |
@@ -202,7 +201,7 @@
   
   $ echo 'babar' >> a
   $ hg amend
-  $ hg up 15
+  $ hg up --hidden 15
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   Working directory parent is obsolete
   $ mv a a.old
@@ -229,7 +228,7 @@
 
 Stabilize It
 
-  $ hg evolve -qn
+  $ hg evolve -qn --traceback
   hg update -c 3883461cc228 &&
   hg merge 4754d61bc2db &&
   hg commit -m "auto merge resolving conflict between 3883461cc228 and 4754d61bc2db"&&
@@ -266,7 +265,7 @@
    More addition
   branch: default
   commit: (clean)
-  update: 19 new changesets, 14 branch heads (merge)
+  update: 2 new changesets, 2 branch heads (merge)
   $ hg export .
   # HG changeset patch
   # User test
@@ -292,7 +291,7 @@
 Check conflicting during conflicting resolution
 -------------------------------------------------
 
-  $ hg up 15
+  $ hg up --hidden 15
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   Working directory parent is obsolete
   $ echo 'gotta break' >> a