--- a/tests/test-evolve.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-evolve.t	Fri Oct 20 20:04:13 2017 +0200
@@ -344,7 +344,7 @@
 (amend of on ancestors)
 
   $ hg amend
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg log
   6	feature-A: a nifty feature - test
   4	feature-B: another feature (child of 568a468b60fc) - test
@@ -399,7 +399,7 @@
 phase change turning obsolete changeset public issue a bumped warning
 
   $ hg phase --hidden --public 99833d22b0c6
-  1 new phase-divergent changesets
+  1 new bumped changesets
 
 all solving bumped troubled
 
@@ -446,7 +446,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ sed -i'' -e s/Un/Én/ main-file-1
   $ hg commit --amend -m 'dansk!'
-  2 new orphan changesets
+  2 new unstable changesets
 
 (ninja test for the {trouble} template:
 
@@ -831,7 +831,7 @@
   $ hg ci -m c
   $ hg prune .^
   1 changesets pruned
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg stab --any
   move:[15] c
   atop:[13] a
@@ -908,7 +908,7 @@
   marked working directory as branch mybranch
   (branches are permanent and global, did you want a bookmark?)
   $ hg amend
-  1 new orphan changesets
+  1 new unstable changesets
 
   $ hg evolve
   move:[3] a3
@@ -930,7 +930,7 @@
   $ hg up 'desc(a1)'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg amend -m 'a1_'
-  2 new orphan changesets
+  2 new unstable changesets
   $ hg evolve
   move:[5] a2
   atop:[7] a1_
@@ -954,7 +954,7 @@
   $ hg up -r "desc('a1_')"
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg ci --amend -m 'a1__'
-  2 new orphan changesets
+  2 new unstable changesets
 
   $ hg up -r "desc('a2')"
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -1027,7 +1027,7 @@
   $ hg add newfile
   $ hg commit -m "add new file bumped" -o 11
   $ hg phase --public --hidden d952e93add6f
-  1 new phase-divergent changesets
+  1 new bumped changesets
   $ hg log -G
   @  12	: add new file bumped - test
   |
@@ -1099,7 +1099,7 @@
   o  0	: a0 - test
   
   $ hg amend
-  2 new orphan changesets
+  2 new unstable changesets
   $ hg log -G
   @  18	: a3 - test
   |
@@ -1260,7 +1260,7 @@
   $ echo "hello" > j4
   $ hg add j4
   $ hg amend
-  2 new orphan changesets
+  2 new unstable changesets
   $ glog -r "edc3c9de504e::"
   @  25:8dc373be86d9@default(draft) add j1
   |
@@ -1432,7 +1432,7 @@
   $ hg commit -m "_pp"
   $ hg prune --succ "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" --split
   1 changesets pruned
-  1 new orphan changesets
+  1 new unstable changesets
   $ glog -r "edc3c9de504e::"
   @  35:7a555adf2b4a@default(draft) _pp
   |
@@ -1476,7 +1476,7 @@
   $ hg update -q 36030b147271
   $ echo "amended" > newfile
   $ hg amend -m "amended"
-  2 new orphan changesets
+  2 new unstable changesets
 
   $ hg evolve --rev "36030b147271::"
   move:[38] will be evolved safely