diff -r f17a0f801e0b -r a9c27df23129 tests/test-stabilize-order.t
--- a/tests/test-stabilize-order.t	Tue Aug 21 12:43:21 2012 +0200
+++ b/tests/test-stabilize-order.t	Fri Aug 24 11:53:55 2012 +0200
@@ -5,7 +5,6 @@
   > hgext.rebase=
   > hgext.graphlog=
   > EOF
-  $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
 
   $ glog() {
@@ -40,13 +39,13 @@
   [2] addb
   $ echo b >> b
   $ hg amend
-  1 new unstables changesets
+  1 new unstable changesets
   $ hg gdown
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   [1] adda
   $ echo a >> a
   $ hg amend
-  1 new unstables changesets
+  1 new unstable changesets
   $ glog
   @  7:f5ff10856e5a@default(draft) adda
   |
@@ -54,16 +53,16 @@
   | |
   | | o  3:7a7552255fb5@default(draft) addc
   | | |
-  | | o  2:ef23d6ef94d6@default(draft) addb
+  | | x  2:ef23d6ef94d6@default(draft) addb
   | |/
-  | o  1:93418d2c0979@default(draft) adda
+  | x  1:93418d2c0979@default(draft) adda
   |/
   o  0:c471ef929e6a@default(draft) addroot
   
 
 Test stabilizing a predecessor child
 
-  $ hg stabilize -v
+  $ hg evolve -v
   move:[5] addb
   atop:[7] adda
   hg rebase -Dr ab8cbb6d87ff -d f5ff10856e5a
@@ -77,9 +76,9 @@
   |
   | o  3:7a7552255fb5@default(draft) addc
   | |
-  | o  2:ef23d6ef94d6@default(draft) addb
+  | x  2:ef23d6ef94d6@default(draft) addb
   | |
-  | o  1:93418d2c0979@default(draft) adda
+  | x  1:93418d2c0979@default(draft) adda
   |/
   o  0:c471ef929e6a@default(draft) addroot
   
@@ -88,8 +87,8 @@
 
   $ hg up 7
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ hg debugsuccessors > successors.old
-  $ hg stabilize -v
+  $ hg debugobsolete > successors.old
+  $ hg evolve -v
   move:[3] addc
   atop:[8] addb
   hg rebase -Dr 7a7552255fb5 -d 6bf44048e43f
@@ -98,17 +97,15 @@
   resolving manifests
   getting c
   c
-  $ hg debugsuccessors > successors.new
+  $ hg debugobsolete > successors.new
   $ diff -u successors.old successors.new
   --- successors.old* (glob)
   +++ successors.new* (glob)
-  @@ -1,5 +1,6 @@
-   3a4a591493f8 f5ff10856e5a
-   3ca0ded0dc50 ab8cbb6d87ff
-  +7a7552255fb5 5e819fbb0d27
-   93418d2c0979 f5ff10856e5a
-   ab8cbb6d87ff 6bf44048e43f
-   ef23d6ef94d6 ab8cbb6d87ff
+  @@ -3,3 +3,4 @@
+   3a4a591493f80708e46f2bf6d3b4debfad8ff91e f5ff10856e5ab3c8dc420b9c11460e6832a3b78c 0 {'date': '* *', 'user': 'test'} (glob)
+   93418d2c0979643ad446f621195e78720edb05b4 f5ff10856e5ab3c8dc420b9c11460e6832a3b78c 0 {'date': '* *', 'user': 'test'} (glob)
+   ab8cbb6d87ff3ab5526735a051cba6b63f3d6775 6bf44048e43f830accbf7d2bd7bc252ad7a3b99c 0 {'date': '* *', 'user': 'test'} (glob)
+  +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 5e819fbb0d278117c0a83b7f6f6486689732cfb2 0 {'date': '* *', 'user': 'test'} (glob)
   [1]
   $ glog
   @  9:5e819fbb0d27@default(draft) addc
@@ -119,8 +116,8 @@
   |
   o  0:c471ef929e6a@default(draft) addroot
   
-  $ hg stabilize -v
-  no unstable changeset
+  $ hg evolve -v
+  no troubled changeset
   [1]
 
 Test behaviour with --any
@@ -129,13 +126,13 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo b >> b
   $ hg amend
-  1 new unstables changesets
+  1 new unstable changesets
   $ glog
   @  11:4e7cec6b4afe@default(draft) addb
   |
   | o  9:5e819fbb0d27@default(draft) addc
   | |
-  | o  8:6bf44048e43f@default(draft) addb
+  | x  8:6bf44048e43f@default(draft) addb
   |/
   o  7:f5ff10856e5a@default(draft) adda
   |
@@ -143,11 +140,11 @@
   
   $ hg up 9
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg stabilize -v
-  nothing to stabilize here
-  (1 unstable changesets, do you want --any ?)
+  $ hg evolve -v
+  nothing to evolve here
+  (1 troubled changesets, do you want --any ?)
   [2]
-  $ hg stabilize --any -v
+  $ hg evolve --any -v
   move:[9] addc
   atop:[11] addb
   hg rebase -Dr 5e819fbb0d27 -d 4e7cec6b4afe
@@ -166,6 +163,6 @@
   |
   o  0:c471ef929e6a@default(draft) addroot
   
-  $ hg stabilize --any -v
-  no unstable changeset
+  $ hg evolve --any -v
+  no troubled changeset
   [1]