--- a/tests/test-obsolete.t	Sun Dec 02 16:21:19 2012 +0100
+++ b/tests/test-obsolete.t	Mon Dec 03 00:10:58 2012 +0100
@@ -4,8 +4,6 @@
   > allow_push = *
   > [phases]
   > publish=False
-  > [alias]
-  > odiff=diff --rev 'limit(precursors(.),1)' --rev .
   > [extensions]
   > hgext.rebase=
   > EOF
@@ -16,7 +14,7 @@
   >    hg ci -m "add $1"
   > }
   $ getid() {
-  >    hg id --debug -ir "$1"
+  >    hg id --hidden --debug -ir "$1"
   > }
 
   $ alias qlog="hg log --template='{rev}\n- {node|short}\n'"
@@ -120,7 +118,7 @@
   - 0d3f46688ccc
   4
   - 725c380fe99b
-  $ hg up 3 -q
+  $ hg up --hidden 3 -q
   Working directory parent is obsolete
   $ mkcommit d # 5 (on 3)
   1 new unstable changesets
@@ -194,7 +192,7 @@
   - 7c3bad9141dc
   0
   - 1f0dee641bb7
-  $ hg up 3 -q
+  $ hg up --hidden 3 -q
   Working directory parent is obsolete
   $ mkcommit obsol_d # 6
   created new head
@@ -250,7 +248,7 @@
   no changes found
   [1]
 
-  $ hg up -q .^ # 3
+  $ hg up --hidden -q .^ # 3
   Working directory parent is obsolete
   $ mkcommit "obsol_d'" # 7
   created new head
@@ -337,7 +335,7 @@
 
 Test rollback support
 
-  $ hg up .^ -q # 3
+  $ hg up --hidden .^ -q # 3
   Working directory parent is obsolete
   $ mkcommit "obsol_d''"
   created new head
@@ -374,7 +372,7 @@
    add obsol_c'
   branch: default
   commit: 1 deleted, 2 unknown (clean)
-  update: 4 new changesets, 4 branch heads (merge)
+  update: 2 new changesets, 2 branch heads (merge)
   unstable: 1 changesets
   divergent: 1 changesets
   $ qlog
@@ -494,8 +492,6 @@
 should not rebase extinct changeset
 
 #excluded 'whole rebase set is extinct and ignored.' message not in core
-  $ hg rebase -s 7 -d 4 2>&1 | grep -v 'whole rebase' 
-  nothing to rebase
   $ hg rebase -b '3' -d 4 --traceback
   2 new divergent changesets
   $ hg log -G --template='{rev} - {node|short} {desc}\n'
@@ -536,7 +532,7 @@
 (make an obsolete changeset public)
 
   $ cd local
-  $ hg phase --public 11
+  $ hg phase --hidden --public 11
   1 new bumped changesets
   $ hg log -G --template='{rev} - ({phase}) {node|short} {desc}\n'
   @  12 - (draft) 6db5e282cb91 add obsol_d'''
@@ -640,7 +636,7 @@
    add obsolet_conflicting_d
   branch: default
   commit: (clean)
-  update: (9|11) new changesets, (9|10) branch heads \(merge\) (re)
+  update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re)
   bumped: 1 changesets
   $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
   $ hg log -r 'conflicting()'