--- a/tests/test-stabilize-result.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-stabilize-result.t	Fri Oct 20 20:04:13 2017 +0200
@@ -27,7 +27,7 @@
   (leaving bookmark changea)
   $ echo a >> a
   $ hg amend -m changea
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg evolve -v --confirm
   move:[2] changea
   atop:[4] changea
@@ -76,7 +76,7 @@
   [4] changea
   $ echo 'a' > a
   $ hg amend
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg evolve
   move:[5] newer a
   atop:[7] changea
@@ -141,7 +141,7 @@
 Make precursors public
 
   $ hg phase --hidden --public 1cf0aacfd363
-  1 new phase-divergent changesets
+  1 new bumped changesets
   $ glog
   @  12:(73b15c7566e9|d5c7ef82d003)@default\(draft\) bk:\[\] newer a (re)
   |
@@ -159,9 +159,9 @@
   $ hg evolve --any --dry-run --phasedivergent
   recreate:[12] newer a
   atop:[8] newer a
-  hg rebase --rev d5c7ef82d003 --dest 66719795a494;
+  hg rebase --rev (73b15c7566e9|d5c7ef82d003) --dest 66719795a494; (re)
   hg update 1cf0aacfd363;
-  hg revert --all --rev d5c7ef82d003;
+  hg revert --all --rev (73b15c7566e9|d5c7ef82d003); (re)
   hg commit --msg "bumped update to %s" (no-eol)
   $ hg evolve --any --confirm --phasedivergent
   recreate:[12] newer a
@@ -207,7 +207,7 @@
   $ glog
   @  15:3932c176bbaa@default(draft) bk:[] More addition
   |
-  | o  14:c2c1151aa854@default(draft) bk:[] bumped update to 1cf0aacfd363:
+  | o  14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re)
   | |
   o |  9:7bc2f5967f5e@default(draft) bk:[] add c
   | |
@@ -228,13 +228,13 @@
   $ cat a.old >> a
   $ rm a.old
   $ hg amend
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ glog
   @  19:eacc9c8240fe@default(draft) bk:[] More addition
   |
   | o  17:d2f173e25686@default(draft) bk:[] More addition
   |/
-  | o  14:c2c1151aa854@default(draft) bk:[] bumped update to 1cf0aacfd363:
+  | o  14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re)
   | |
   o |  9:7bc2f5967f5e@default(draft) bk:[] add c
   | |
@@ -289,7 +289,7 @@
   $ glog
   @  21:f344982e63c4@default(draft) bk:[] More addition
   |
-  | o  14:c2c1151aa854@default(draft) bk:[] bumped update to 1cf0aacfd363:
+  | o  14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re)
   | |
   o |  9:7bc2f5967f5e@default(draft) bk:[] add c
   | |
@@ -338,7 +338,7 @@
   (use 'hg evolve' to update to its successor: f344982e63c4)
   $ echo 'gotta break' >> a
   $ hg amend
-  2 new content-divergent changesets
+  2 new divergent changesets
 # reamend so that the case is not the first precursor.
   $ hg amend -m "More addition (2)"
   $ hg phase 'contentdivergent()'