# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1508522653 -7200
# Node ID a867d59ea97a89faa9a81225aeb073b85c617d3b
# Parent  f5d472b7e800a9202dd45da2851b393597752f70
test-compat: revert output changes from phase renaming

We keep using the old name for the older version. test has to reflect that.

diff -r f5d472b7e800 -r a867d59ea97a tests/test-divergent.t
--- a/tests/test-divergent.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-divergent.t	Fri Oct 20 20:04:13 2017 +0200
@@ -45,7 +45,7 @@
   1 changesets pruned
   $ hg prune -s "desc(bdivergent2)" "desc(_b)" --hidden
   1 changesets pruned
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ hg log -G
   @  3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent]
   |
@@ -88,7 +88,7 @@
   1 changesets pruned
   $ hg prune -s "desc(cdivergent2)" "desc(_c)" --hidden
   1 changesets pruned
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ hg log -G
   @  8:0a768ef678d9@default(draft) cdivergent2 [content-divergent]
   |
@@ -124,7 +124,7 @@
   1 changesets pruned
   $ hg prune -s "desc(bdivergent2)" "desc(_b)" --hidden
   1 changesets pruned
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ hg log -G
   @  3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent]
   |
diff -r f5d472b7e800 -r a867d59ea97a tests/test-evolve-bumped.t
--- a/tests/test-evolve-bumped.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-evolve-bumped.t	Fri Oct 20 20:04:13 2017 +0200
@@ -67,7 +67,7 @@
   pulling from ../public
   searching for changes
   no changes found
-  1 new phase-divergent changesets
+  1 new bumped changesets
 
   $ hg evolve -a -A --phasedivergent
   recreate:[2] tweak a
@@ -105,7 +105,7 @@
   $ hg commit -m "merge"
   $ hg commit --amend -m "New message"
   $ hg phase --public 551127da2a8a --hidden
-  1 new phase-divergent changesets
+  1 new bumped changesets
   $ hg log -G
   @    7:b28e84916d8c@default(draft) New message
   |\
diff -r f5d472b7e800 -r a867d59ea97a tests/test-evolve-cycles.t
--- a/tests/test-evolve-cycles.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-evolve-cycles.t	Fri Oct 20 20:04:13 2017 +0200
@@ -50,7 +50,7 @@
 Create a cycle
   $ hg prune -s "desc(B)" "desc(A)"
   1 changesets pruned
-  2 new orphan changesets
+  2 new unstable changesets
   $ hg prune -s "desc(C)" "desc(B)"
   1 changesets pruned
   $ hg prune -s "desc(A)" "desc(C)"
@@ -188,7 +188,7 @@
 Create a first cycle
   $ hg prune -s "desc(B)" "desc(A)"
   1 changesets pruned
-  5 new orphan changesets
+  5 new unstable changesets
   $ hg prune -s "desc(C)" "desc(B)"
   1 changesets pruned
   $ hg prune --split -s "desc(A)" -s "desc(D)" "desc(C)"
diff -r f5d472b7e800 -r a867d59ea97a tests/test-evolve-list.t
--- a/tests/test-evolve-list.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-evolve-list.t	Fri Oct 20 20:04:13 2017 +0200
@@ -17,7 +17,7 @@
   $ hg up 0
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo a >> a && hg ci --amend -m a
-  2 new orphan changesets
+  2 new unstable changesets
   $ hg evolve --list
   d2ae7f538514: b
     unstable: cb9a9f314b8b (obsolete parent)
@@ -34,7 +34,7 @@
   adding a
   $ echo b > b && hg ci --amend -m ab
   $ hg phase --public --rev 0 --hidden
-  1 new phase-divergent changesets
+  1 new bumped changesets
   $ hg evolve --list
   88cc282e27fc: ab
     bumped: cb9a9f314b8b (immutable precursor)
@@ -64,7 +64,7 @@
   rebasing 1:d2ae7f538514 "b"
   $ hg rebase -s 1 -d 3 --hidden --config experimental.allowdivergence=True
   rebasing 1:d2ae7f538514 "b"
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ hg evolve --list
   c882616e9d84: b
     divergent: a922b3733e98 (draft) (precursor d2ae7f538514)
diff -r f5d472b7e800 -r a867d59ea97a tests/test-evolve-obshistory-complex.t
--- a/tests/test-evolve-obshistory-complex.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-evolve-obshistory-complex.t	Fri Oct 20 20:04:13 2017 +0200
@@ -68,7 +68,7 @@
 
   $ hg fold --exact -r 1 -r 2 --date "0 0" -m "fold0"
   2 changesets folded
-  4 new orphan changesets
+  4 new unstable changesets
   $ hg fold --exact -r 3 -r 4 --date "0 0" -m "fold1"
   2 changesets folded
   $ hg fold --exact -r 5 -r 6 --date "0 0" -m "fold2"
@@ -80,14 +80,14 @@
   |  parent:      4:868d2e0eb19c
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  instability: orphan
+  |  trouble:     unstable
   |  summary:     fold2
   |
   | o  changeset:   8:d15d0ffc75f6
   | |  parent:      2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  instability: orphan
+  | |  trouble:     unstable
   | |  summary:     fold1
   | |
   | | o  changeset:   7:b868bc49b0a4
@@ -236,27 +236,27 @@
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  instability: orphan
+  |  trouble:     unstable
   |  summary:     fold2
   |
   o  changeset:   14:ec31316faa9d
   |  parent:      4:868d2e0eb19c
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  instability: orphan
+  |  trouble:     unstable
   |  summary:     fold2
   |
   | o  changeset:   13:d0f33db50670
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  instability: orphan
+  | |  trouble:     unstable
   | |  summary:     fold1
   | |
   | o  changeset:   12:7b3290f6e0a0
   | |  parent:      2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  instability: orphan
+  | |  trouble:     unstable
   | |  summary:     fold1
   | |
   | | o  changeset:   11:e036916b63ea
@@ -312,21 +312,21 @@
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  instability: orphan
+  |  trouble:     unstable
   |  summary:     fold2
   |
   o  changeset:   14:ec31316faa9d
   |  parent:      4:868d2e0eb19c
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  instability: orphan
+  |  trouble:     unstable
   |  summary:     fold2
   |
   | o  changeset:   12:7b3290f6e0a0
   | |  parent:      2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  instability: orphan
+  | |  trouble:     unstable
   | |  summary:     fold1
   | |
   | | o  changeset:   10:19e14c8397fc
diff -r f5d472b7e800 -r a867d59ea97a tests/test-evolve-obshistory.t
--- a/tests/test-evolve-obshistory.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-evolve-obshistory.t	Fri Oct 20 20:04:13 2017 +0200
@@ -80,7 +80,7 @@
   
 
   $ hg obslog --no-graph --patch 4ae3a4151de9
-  4ae3a4151de9 (2) A1
+  4ae3a4151de9 (3) A1
   471f378eab4c (1) A0
     rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
       --- a/471f378eab4c-changeset-description	
@@ -1015,21 +1015,21 @@
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: fdf9bde5129a)
   $ hg amend -m "A2"
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ hg log --hidden -G
   @  changeset:   3:65b757b745b9
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  instability: content-divergent
+  |  trouble:     divergent
   |  summary:     A2
   |
   | o  changeset:   2:fdf9bde5129a
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    instability: content-divergent
+  |    trouble:     divergent
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c
diff -r f5d472b7e800 -r a867d59ea97a tests/test-evolve-order.t
--- a/tests/test-evolve-order.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-evolve-order.t	Fri Oct 20 20:04:13 2017 +0200
@@ -44,7 +44,7 @@
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo "aaa" > _a
   $ hg amend
-  2 new orphan changesets
+  2 new unstable changesets
   $ hg log -G
   @  5:12d519679175@default(draft) add _a
   |
@@ -73,7 +73,7 @@
   $ hg up "desc(_a)"
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ hg amend -m "aprime"
-  3 new orphan changesets
+  3 new unstable changesets
   $ hg evolve --rev "desc(_b)"
   move:[6] add _b
   atop:[9] aprime
@@ -84,7 +84,7 @@
   $ hg up "desc(aprime)"
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg amend -m "asecond"
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg log -G
   @  12:9a584314f3f3@default(draft) asecond
   |
@@ -131,12 +131,12 @@
   $ mkstack "desc(_d)" c1second >/dev/null
   $ hg prune "desc(c1_)" -s "desc(c1prime)"
   1 changesets pruned
-  3 new orphan changesets
+  3 new unstable changesets
   $ hg prune "desc(c2_)" -s "desc(c2prime)"
   1 changesets pruned
   $ hg prune "desc(c1prime)" -s "desc(c1second)"
   1 changesets pruned
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg log -G -r "desc(_d)::"
   @  22:dcf786e878fd@default(draft) add c1second
   |
@@ -161,7 +161,7 @@
   $ mkstack "desc(_d)" b1prime b3prime >/dev/null
   $ hg prune "desc(b1_)" -s "desc(b1prime)"
   1 changesets pruned
-  3 new orphan changesets
+  3 new unstable changesets
   $ hg prune "desc(b3_)" -s "desc(b3prime)"
   1 changesets pruned
   $ hg prune "desc(b2_)"
@@ -249,14 +249,14 @@
   created new head
   $ hg prune -s 'desc(c3part1)' 'desc(c3_)'
   1 changesets pruned
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg prune -s 'desc(c3part2)' 'desc(c3_)'
   1 changesets pruned
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ hg up 'desc(b3prime)'
   2 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ hg amend -m 'b3second'
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg evolve --rev "orphan()"
   move:[30] add b4_
   atop:[35] b3second
diff -r f5d472b7e800 -r a867d59ea97a tests/test-evolve-split.t
--- a/tests/test-evolve-split.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-evolve-split.t	Fri Oct 20 20:04:13 2017 +0200
@@ -44,7 +44,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
   $ hg log -G
   @  4:d0dcf24cddd3@default(draft) _pp
   |
diff -r f5d472b7e800 -r a867d59ea97a tests/test-evolve-templates.t
--- a/tests/test-evolve-templates.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-evolve-templates.t	Fri Oct 20 20:04:13 2017 +0200
@@ -631,21 +631,21 @@
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: fdf9bde5129a)
   $ hg amend -m "A2"
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ hg log --hidden -G
   @  changeset:   3:65b757b745b9
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  instability: content-divergent
+  |  trouble:     divergent
   |  summary:     A2
   |
   | o  changeset:   2:fdf9bde5129a
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    instability: content-divergent
+  |    trouble:     divergent
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c
diff -r f5d472b7e800 -r a867d59ea97a tests/test-evolve-topic.t
--- a/tests/test-evolve-topic.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-evolve-topic.t	Fri Oct 20 20:04:13 2017 +0200
@@ -87,7 +87,7 @@
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo ddd >> ddd
   $ hg amend
-  6 new orphan changesets
+  6 new unstable changesets
   $ hg up 'desc(fff)'
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo fff >> fff
diff -r f5d472b7e800 -r a867d59ea97a tests/test-evolve.t
--- 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
diff -r f5d472b7e800 -r a867d59ea97a tests/test-exchange-obsmarkers-case-A3.t
--- a/tests/test-exchange-obsmarkers-case-A3.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-A3.t	Fri Oct 20 20:04:13 2017 +0200
@@ -264,7 +264,7 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   (run 'hg heads' to see heads, 'hg merge' to merge)
-  1 new orphan changesets
+  1 new unstable changesets
   ## post pull state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
diff -r f5d472b7e800 -r a867d59ea97a tests/test-exchange-obsmarkers-case-C1.t
--- a/tests/test-exchange-obsmarkers-case-C1.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-C1.t	Fri Oct 20 20:04:13 2017 +0200
@@ -58,7 +58,7 @@
   $ mkcommit A
   $ mkcommit B
   $ hg prune -qd '0 0' '.~1'
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg prune -qd '0 0' .
   $ hg log -G --hidden
   x  f6fbb35d8ac9 (draft): B
diff -r f5d472b7e800 -r a867d59ea97a tests/test-inhibit.t
--- a/tests/test-inhibit.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-inhibit.t	Fri Oct 20 20:04:13 2017 +0200
@@ -159,7 +159,7 @@
   o  0:54ccbc537fc2 add cA
   
   $ hg phase --public 7
-  1 new phase-divergent changesets
+  1 new bumped changesets
   $ hg strip 9
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory now at cf5c4f4554ce
diff -r f5d472b7e800 -r a867d59ea97a tests/test-obsolete-push.t
--- a/tests/test-obsolete-push.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-obsolete-push.t	Fri Oct 20 20:04:13 2017 +0200
@@ -26,7 +26,7 @@
   $ hg phase --secret --force .
   $ hg prune 0 1
   2 changesets pruned
-  1 new orphan changesets
+  1 new unstable changesets
   $ glog --hidden
   @  2:244232c2222a@default(secret) C
   |
diff -r f5d472b7e800 -r a867d59ea97a tests/test-obsolete.t
--- a/tests/test-obsolete.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-obsolete.t	Fri Oct 20 20:04:13 2017 +0200
@@ -134,7 +134,7 @@
   working directory parent is obsolete! (0d3f46688ccc)
   (use 'hg evolve' to update to its successor: 725c380fe99b)
   $ mkcommit d # 5 (on 3)
-  1 new orphan changesets
+  1 new unstable changesets
   $ qlog -r 'obsolete()'
   3
   - 0d3f46688ccc
@@ -175,7 +175,7 @@
   $ hg push ../other-new
   pushing to ../other-new
   searching for changes
-  abort: push includes orphan changeset: a7a6f2b5d8a5!
+  abort: push includes unstable changeset: a7a6f2b5d8a5!
   (use 'hg evolve' to get a stable history or --force to ignore warnings)
   [255]
   $ hg push -f ../other-new
@@ -210,7 +210,7 @@
   working directory parent is obsolete! (0d3f46688ccc)
   $ mkcommit obsol_d # 6
   created new head
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg debugobsolete `getid 5` `getid 6`
   obsoleted 1 changesets
   $ qlog
@@ -230,7 +230,7 @@
   $ hg push ../other-new
   pushing to ../other-new
   searching for changes
-  abort: push includes orphan changeset: 95de7fc6918d!
+  abort: push includes unstable changeset: 95de7fc6918d!
   (use 'hg evolve' to get a stable history or --force to ignore warnings)
   [255]
   $ hg push ../other-new -f # use f because there is unstability
@@ -269,7 +269,7 @@
   working directory parent is obsolete! (0d3f46688ccc)
   $ mkcommit "obsol_d'" # 7
   created new head
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg debugobsolete `getid 6` `getid 7`
   obsoleted 1 changesets
   $ hg pull -R ../other-new .
@@ -359,7 +359,7 @@
   working directory parent is obsolete! (0d3f46688ccc)
   $ mkcommit "obsol_d''"
   created new head
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg debugobsolete `getid 7` `getid 8`
   obsoleted 1 changesets
   $ cd ../other-new
@@ -397,7 +397,7 @@
   commit: 1 deleted, 2 unknown (clean)
   update: 2 new changesets, 2 branch heads (merge)
   phases: 4 draft
-  orphan: 1 changesets
+  unstable: 1 changesets
   $ qlog
   6
   - 909a0fb57e5d
@@ -521,7 +521,7 @@
   $ hg rebase -b '3' -d 4 --traceback --config experimental.rebaseskipobsolete=0
   rebasing 3:0d3f46688ccc "add obsol_c"
   rebasing 8:159dfc9fa5d3 "add obsol_d''" (tip)
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ hg --hidden log -q -r 'successors(3)'
   4:725c380fe99b
   10:2033b4e49474
@@ -572,7 +572,7 @@
 
   $ cd local
   $ hg phase --hidden --public 11
-  1 new phase-divergent changesets
+  1 new bumped changesets
   $ hg log -G --template='{rev} - ({phase}) {node|short} {desc}\n'
   @  12 - (draft) 6db5e282cb91 add obsol_d'''
   |
@@ -592,13 +592,13 @@
   parent:      10:2033b4e49474
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  instability: phase-divergent
+  trouble:     bumped
   summary:     add obsol_d'''
   
   $ hg push ../other-new/
   pushing to ../other-new/
   searching for changes
-  abort: push includes phase-divergent changeset: 6db5e282cb91!
+  abort: push includes bumped changeset: 6db5e282cb91!
   (use 'hg evolve' to get a stable history or --force to ignore warnings)
   [255]
 
@@ -622,7 +622,7 @@
   |/   parent:      10:2033b4e49474
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    instability: phase-divergent
+  |    trouble:     bumped
   |    summary:     add obsol_d'''
   |
   | o  changeset:   11:9468a5f5d8b2
@@ -679,14 +679,14 @@
   commit: (clean)
   update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re)
   phases: 3 draft
-  phase-divergent: 1 changesets
+  bumped: 1 changesets
   $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
   $ hg log -r 'contentdivergent()'
   changeset:   12:6db5e282cb91
   parent:      10:2033b4e49474
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  instability: phase-divergent, content-divergent
+  trouble:     bumped, divergent
   summary:     add obsol_d'''
   
   changeset:   16:50f11e5e3a63
@@ -694,7 +694,7 @@
   parent:      11:9468a5f5d8b2
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  instability: content-divergent
+  trouble:     divergent
   summary:     add obsolet_conflicting_d
   
 
@@ -722,7 +722,7 @@
   (4538525df7e2 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue)
   $ hg export 9468a5f5d8b2 | hg import -
   applying patch from stdin
-  1 new orphan changesets
+  1 new unstable changesets
 
 
 Relevant marker computation
@@ -734,14 +734,14 @@
   |  parent:      2:4538525df7e2
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  instability: orphan
+  |  trouble:     unstable
   |  summary:     add obsol_d''
   |
   | o  changeset:   16:50f11e5e3a63
   | |  parent:      11:9468a5f5d8b2
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  instability: content-divergent
+  | |  trouble:     divergent
   | |  summary:     add obsolet_conflicting_d
   | |
   | | o  changeset:   15:705ab2a6b72e
@@ -767,7 +767,7 @@
   | | |/   parent:      10:2033b4e49474
   | | |    user:        test
   | | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | | |    instability: phase-divergent, content-divergent
+  | | |    trouble:     bumped, divergent
   | | |    summary:     add obsol_d'''
   | | |
   | o |  changeset:   11:9468a5f5d8b2
diff -r f5d472b7e800 -r a867d59ea97a tests/test-prev-next.t
--- a/tests/test-prev-next.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-prev-next.t	Fri Oct 20 20:04:13 2017 +0200
@@ -169,7 +169,7 @@
 some aspiring children
 
   $ hg amend -m 'added b (2)'
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg next
   no children
   (1 unstable changesets to be evolved here, do you want --evolve?)
@@ -209,7 +209,7 @@
 next with ambiguity in aspiring children
 
   $ hg am -m 'added b (3)'
-  2 new orphan changesets
+  2 new unstable changesets
   $ hg next
   no children
   (2 unstable changesets to be evolved here, do you want --evolve?)
@@ -251,7 +251,7 @@
   $ sleep 1
   $ hg next --evolve
   waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob)
-  1 new orphan changesets
+  1 new unstable changesets
   got lock after [4-6] seconds (re)
   move:[2] two
   atop:[3] one
diff -r f5d472b7e800 -r a867d59ea97a tests/test-prune.t
--- a/tests/test-prune.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-prune.t	Fri Oct 20 20:04:13 2017 +0200
@@ -63,7 +63,7 @@
 
   $ hg prune 1
   1 changesets pruned
-  2 new orphan changesets
+  2 new unstable changesets
   $ hg book -i BABAR
   $ hg debugobsolete
   9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob)
diff -r f5d472b7e800 -r a867d59ea97a tests/test-sharing.t
--- a/tests/test-sharing.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-sharing.t	Fri Oct 20 20:04:13 2017 +0200
@@ -494,7 +494,7 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
   (run 'hg heads' to see heads, 'hg merge' to merge)
-  2 new content-divergent changesets
+  2 new divergent changesets
 
 Figure SG09: multiple heads! divergence! oh my!
   $ hg --hidden shortlog -G -r 3::
diff -r f5d472b7e800 -r a867d59ea97a tests/test-split.t
--- a/tests/test-split.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-split.t	Fri Oct 20 20:04:13 2017 +0200
@@ -148,7 +148,7 @@
 Split a revision specified with -r
   $ echo "change to b" >> _b
   $ hg amend -m "_cprim"
-  2 new orphan changesets
+  2 new unstable changesets
   $ hg evolve --all
   move:[6] split1
   atop:[9] _cprim
diff -r f5d472b7e800 -r a867d59ea97a tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-stabilize-conflict.t	Fri Oct 20 20:04:13 2017 +0200
@@ -76,7 +76,7 @@
    neuf
    dix
   $ hg amend
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg evolve
   move:[2] babar count up to fifteen
   atop:[4] babar count up to ten
@@ -114,7 +114,7 @@
   $ hg diff
   diff -r 5977072d13c5 babar
   --- a/babar	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/babar	Thu Jan 01 00:00:00 1970 +0000
+  +++ b/babar	* (glob)
   @@ -7,4 +7,4 @@
    sept
    eight
@@ -122,7 +122,7 @@
   -dix
   +ten
   $ hg amend
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg evolve
   move:[5] babar count up to fifteen
   atop:[7] babar count up to ten
@@ -145,7 +145,7 @@
   | o  changeset:   5:71c18f70c34f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  instability: orphan
+  | |  trouble:     unstable
   | |  summary:     babar count up to fifteen
   | |
   | x  changeset:   4:5977072d13c5
@@ -209,7 +209,7 @@
   -ten
   +zehn
   $ hg amend
-  1 new orphan changesets
+  1 new unstable changesets
   $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH
   $ hg evolve --tool touch <<EOF
   > n
@@ -237,7 +237,7 @@
   | o  changeset:   8:1836b91c6c1d
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  instability: orphan
+  | |  trouble:     unstable
   | |  summary:     babar count up to fifteen
   | |
   | x  changeset:   7:e04690b09bc6
diff -r f5d472b7e800 -r a867d59ea97a tests/test-stabilize-order.t
--- a/tests/test-stabilize-order.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-stabilize-order.t	Fri Oct 20 20:04:13 2017 +0200
@@ -38,14 +38,14 @@
   [2] addb
   $ echo b >> b
   $ hg amend
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg gdown
   gdown have been deprecated in favor of previous
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   [1] adda
   $ echo a >> a
   $ hg amend
-  1 new orphan changesets
+  1 new unstable changesets
   $ glog
   @  7:005fe5914f78@default(draft) adda
   |
@@ -110,10 +110,10 @@
   --- successors.old* (glob)
   +++ successors.new* (glob)
   @@ -3,3 +3,4 @@
-   93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 (*) {'ef1': '8', 'user': 'test'} (glob)
-   7a7d76dc97c57751de9e80f61ed2a639bd03cd24 0 {93418d2c0979643ad446f621195e78720edb05b4} (*) {'ef1': '0', 'user': 'test'} (glob)
-   22619daeed78036f80fbd326b6852519c4f0c25e 81b8bbcd5892841efed41433d7a5e9df922396cb 0 (*) {'ef1': '4', 'user': 'test'} (glob)
-  +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 0f691739f91762462bf8ba21f35fdf71fe64310e 0 (*) {'ef1': '4', 'user': 'test'} (glob)
+   93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+   7a7d76dc97c57751de9e80f61ed2a639bd03cd24 0 {93418d2c0979643ad446f621195e78720edb05b4} (*) {'ef1': '*', 'user': 'test'} (glob)
+   22619daeed78036f80fbd326b6852519c4f0c25e 81b8bbcd5892841efed41433d7a5e9df922396cb 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+  +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 0f691739f91762462bf8ba21f35fdf71fe64310e 0 (*) {'ef1': '*', 'user': 'test'} (glob)
   [1]
 
 
@@ -137,7 +137,7 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo b >> b
   $ hg amend
-  1 new orphan changesets
+  1 new unstable changesets
   $ glog
   @  11:7a68bc4596ea@default(draft) addb
   |
@@ -195,7 +195,7 @@
   $ hg up .^
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg commit --amend -m "newmessage"
-  2 new orphan changesets
+  2 new unstable changesets
   $ hg log -G
   @  changeset:   15:f83a0bce03e4
   |  tag:         tip
@@ -208,13 +208,13 @@
   | |  parent:      12:2256dae6521f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  instability: orphan
+  | |  trouble:     unstable
   | |  summary:     secondambiguous
   | |
   | | o  changeset:   13:bdc003b6eec2
   | |/   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | |    instability: orphan
+  | |    trouble:     unstable
   | |    summary:     firstambiguous
   | |
   | x  changeset:   12:2256dae6521f
diff -r f5d472b7e800 -r a867d59ea97a tests/test-stabilize-result.t
--- 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()'
diff -r f5d472b7e800 -r a867d59ea97a tests/test-topic-stack-data.t
--- a/tests/test-topic-stack-data.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-topic-stack-data.t	Fri Oct 20 20:04:13 2017 +0200
@@ -111,7 +111,7 @@
   commit: (clean)
   update: 2 new changesets (update)
   phases: 22 draft
-  orphan: 3 changesets
+  unstable: 3 changesets
   topic:  foo
   $ hg log --graph -T '{desc} ({branch}) [{topic}]'
   @  add foo_b (lake) []
diff -r f5d472b7e800 -r a867d59ea97a tests/test-topic-tutorial.t
--- a/tests/test-topic-tutorial.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-topic-tutorial.t	Fri Oct 20 20:04:13 2017 +0200
@@ -1182,7 +1182,7 @@
   t0^ add a pair of shoes (base)
 
   $ hg amend -m "Adding hammer to the shopping list"
-  2 new orphan changesets
+  2 new unstable changesets
 
 Understanding the current situation with hg log is not so easy, because
 it shows too many things:
@@ -1211,14 +1211,14 @@
   | |  topic:       tools
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  instability: orphan
+  | |  trouble:     unstable
   | |  summary:     Adding drill
   | |
   | o  changeset:   14:d4f97f32f8a1
   | |  topic:       tools
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  instability: orphan
+  | |  trouble:     unstable
   | |  summary:     Adding saw
   | |
   | x  changeset:   13:a8ab3599d53d
diff -r f5d472b7e800 -r a867d59ea97a tests/test-touch.t
--- a/tests/test-touch.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-touch.t	Fri Oct 20 20:04:13 2017 +0200
@@ -44,7 +44,7 @@
   [1] a
   reviving this changeset will create divergence unless you make a duplicate.
   (a)llow divergence or (d)uplicate the changeset?  a
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ hg log -G
   @  4:[0-9a-f]{12} a (re)
   
@@ -105,7 +105,7 @@
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   $ hg touch
-  1 new orphan changesets
+  1 new unstable changesets
 
   $ hg rebase -s 11 -d 12
   rebasing 11:* "move" (glob)
@@ -117,11 +117,11 @@
 check that the --duplicate option does not create divergence
 
   $ hg touch --duplicate 11 --hidden
-  1 new orphan changesets
+  1 new unstable changesets
 
 check that reviving a changeset with no successor does not show the prompt
 
   $ hg prune 14
   1 changesets pruned
   $ hg touch 14 --hidden
-  1 new orphan changesets
+  1 new unstable changesets
diff -r f5d472b7e800 -r a867d59ea97a tests/test-tutorial.t
--- a/tests/test-tutorial.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-tutorial.t	Fri Oct 20 20:04:13 2017 +0200
@@ -1208,7 +1208,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
-  1 new orphan changesets
+  1 new unstable changesets
 
 
 The new changeset "animal" is based on an old changeset of "bathroom". You can
@@ -1353,7 +1353,7 @@
   $ hg push other
   pushing to $TESTTMP/other (glob)
   searching for changes
-  abort: push includes orphan changeset: bf1b0d202029!
+  abort: push includes unstable changeset: bf1b0d202029!
   (use 'hg evolve' to get a stable history or --force to ignore warnings)
   [255]
  
@@ -1671,7 +1671,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory now at a44c85f957d3
   1 changesets pruned
-  1 new orphan changesets
+  1 new unstable changesets
 
 
 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset
diff -r f5d472b7e800 -r a867d59ea97a tests/test-uncommit-interactive.t
--- a/tests/test-uncommit-interactive.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-uncommit-interactive.t	Fri Oct 20 20:04:13 2017 +0200
@@ -597,7 +597,7 @@
   
   patching file a
   Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines).
-  2 new orphan changesets
+  2 new unstable changesets
 
   $ hg diff
   diff -r 676366511f95 a
diff -r f5d472b7e800 -r a867d59ea97a tests/test-uncommit.t
--- a/tests/test-uncommit.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-uncommit.t	Fri Oct 20 20:04:13 2017 +0200
@@ -244,7 +244,7 @@
   (use 'hg evolve' to update to its successor: e8db4aa611f6)
   $ hg --config extensions.purge= purge
   $ hg uncommit -I 'set:added() and e'
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ hg st --copies
   A e
   $ hg st --copies --change .
@@ -290,7 +290,7 @@
   (5eb72dbe0cb4 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue)
   $ hg --config extensions.purge= purge
   $ hg uncommit --all -X e
-  1 new content-divergent changesets
+  1 new divergent changesets
   $ hg st --copies
   M b
   M d
@@ -337,7 +337,7 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   [8] touncommit
   $ hg uncommit aa
-  1 new orphan changesets
+  1 new unstable changesets
 
 Test uncommiting agains a different base
 
diff -r f5d472b7e800 -r a867d59ea97a tests/test-unstable.t
--- a/tests/test-unstable.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-unstable.t	Fri Oct 20 20:04:13 2017 +0200
@@ -42,7 +42,7 @@
   $ hg up "desc(_b)"
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg amend -m "bprime"
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg log -G
   @  3:36050226a9b9@default(draft) bprime
   |
@@ -86,7 +86,7 @@
   $ hg up "desc(_a)"
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg amend -m "aprime"
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg log -G
   @  4:47127ea62e5f@default(draft) aprime
   |
@@ -134,7 +134,7 @@
   $ hg up "desc(_a)"
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg amend -m "aprime"
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg up "desc(_c)"
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg amend -m "cprime"
@@ -185,7 +185,7 @@
   created new head
   $ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split
   1 changesets pruned
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg log -G
   @  4:2a4ccc0bb20c@default(draft) add bprimesplit2
   |
@@ -230,14 +230,14 @@
   created new head
   $ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split
   1 changesets pruned
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg up "desc(_a)"
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ mkcommits bsecondsplit1 bsecondsplit2
   created new head
   $ hg prune "desc(bprimesplit1)" -s "desc(bsecondsplit2)"
   1 changesets pruned
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg prune "desc(bprimesplit2)" -s "desc(bsecondsplit1)"
   1 changesets pruned
   $ hg log -G
@@ -288,7 +288,7 @@
   created new head
   $ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split
   1 changesets pruned
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg log -G
   @  4:3c69ea6aa93e@default(draft) add bprimesplit2
   |
diff -r f5d472b7e800 -r a867d59ea97a tests/test-userguide.t
--- a/tests/test-userguide.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-userguide.t	Fri Oct 20 20:04:13 2017 +0200
@@ -165,7 +165,7 @@
   $ hg update -q -r 3e1cb8f70c02
   $ echo 'fix fix fix fix' > file2.c
   $ hg amend -u bob -d '6 0'
-  2 new orphan changesets
+  2 new unstable changesets
   $ hg shortlog -r 'obsolete()'
   11:3e1cb8f70c02  draft  fix bug 17
   $ hg shortlog -r "orphan()"
@@ -218,7 +218,7 @@
 example 8: prune an older changeset (figures 8, 9)
   $ hg prune b23d06b457a8
   1 changesets pruned
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg --hidden shortlog -G -r b23d06b457a8::
   @  20:ea8fafca914b  draft  more work
   |
@@ -255,7 +255,7 @@
   |
   ~
   $ hg uncommit file2.c
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg status
   M file2.c
   $ hg revert file2.c
@@ -295,7 +295,7 @@
   |
   ~
   $ hg uncommit file2.c
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg status
   M file2.c
   $ hg commit -m 'useful tweak'