--- a/tests/test-obsolete.t	Wed Sep 19 17:30:07 2012 +0200
+++ b/tests/test-obsolete.t	Wed Sep 19 15:28:35 2012 +0200
@@ -457,16 +457,16 @@
 
 check rebase compat
 
-  $ hg log -G -r 'not extinct()'  --template='{rev} - {node|short}\n'
-  o  8 - 159dfc9fa5d3
+  $ hg log -G  --template='{rev} - {node|short} {desc}\n'
+  o  8 - 159dfc9fa5d3 add obsol_d''
   |
-  | o  4 - 725c380fe99b
+  | o  4 - 725c380fe99b add obsol_c'
   | |
-  x |  3 - 0d3f46688ccc
+  x |  3 - 0d3f46688ccc add obsol_c
   |/
-  o  1 - 7c3bad9141dc
+  o  1 - 7c3bad9141dc add b
   |
-  o  0 - 1f0dee641bb7
+  o  0 - 1f0dee641bb7 add a
   
 
   $ hg log -G  --template='{rev} - {node|short}\n' --hidden
@@ -493,22 +493,21 @@
 
 should not rebase extinct changeset
 
-  $ hg rebase -s 7 -d 4
-  whole rebase set is extinct and ignored.
+#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
-  [1]
-  $ hg rebase -b 3 -d 4 --traceback
+  $ hg rebase -b '3' -d 4 --traceback
   2 new conflicting changesets
-  $ hg log -G -r 'not extinct()'  --template='{rev} - {node|short}\n'
-  @  11 - 9468a5f5d8b2
+  $ hg log -G --template='{rev} - {node|short} {desc}\n'
+  @  11 - 9468a5f5d8b2 add obsol_d''
   |
-  o  10 - 2033b4e49474
+  o  10 - 2033b4e49474 add obsol_c
   |
-  o  4 - 725c380fe99b
+  o  4 - 725c380fe99b add obsol_c'
   |
-  o  1 - 7c3bad9141dc
+  o  1 - 7c3bad9141dc add b
   |
-  o  0 - 1f0dee641bb7
+  o  0 - 1f0dee641bb7 add a
   
 
 Does not complain about new head if you obsolete the old one