Mercurial > evolve

changeset 2854:66796d7b5415

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
warning: rename unstable warning message unstable has been renamed into orphan. Update the warning message when new orphan changesets are detected. Renaming done according to https://www.mercurial-scm.org/wiki/CEDVocabulary
author Boris Feld <boris.feld@octobus.net>
date Thu, 24 Aug 2017 09:11:06 +0200
parents cec3d2ea2eeb
children 1db0137297f4
files hgext3rd/evolve/__init__.py hgext3rd/evolve/compat.py tests/test-evolve-cycles.t tests/test-evolve-list.t tests/test-evolve-obshistory-complex.t tests/test-evolve-order.t tests/test-evolve-split.t tests/test-evolve-topic.t tests/test-evolve.t tests/test-exchange-obsmarkers-case-A3.t tests/test-exchange-obsmarkers-case-C1.t tests/test-obsolete-push.t tests/test-obsolete.t tests/test-prev-next.t tests/test-prune.t tests/test-split.t tests/test-stabilize-conflict.t tests/test-stabilize-order.t tests/test-stabilize-result.t tests/test-topic-tutorial.t tests/test-touch.t tests/test-tutorial.t tests/test-uncommit.t tests/test-unstable.t tests/test-userguide.t
diffstat 25 files changed, 72 insertions(+), 65 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/__init__.py	Wed Aug 23 23:44:36 2017 +0200
+++ b/hgext3rd/evolve/__init__.py	Thu Aug 24 09:11:06 2017 +0200
@@ -770,8 +770,10 @@
         len(set(getrevs(repo, 'phasedivergent')) - filtered) - priorbumpeds
     newdivergents = \
         len(set(getrevs(repo, 'contentdivergent')) - filtered) - priordivergents
+
+    base_msg = _('%i new %s changesets\n')
     if newunstables > 0:
-        ui.warn(_('%i new unstable changesets\n') % newunstables)
+        ui.warn(base_msg % (newunstables, compat.TROUBLES['ORPHAN']))
     if newbumpeds > 0:
         ui.warn(_('%i new bumped changesets\n') % newbumpeds)
     if newdivergents > 0:
--- a/hgext3rd/evolve/compat.py	Wed Aug 23 23:44:36 2017 +0200
+++ b/hgext3rd/evolve/compat.py	Thu Aug 24 09:11:06 2017 +0200
@@ -98,8 +98,13 @@
 
 # Evolution renaming compat
 
+TROUBLES = {}
+
 if not util.safehasattr(context.basectx, 'orphan'):
+    TROUBLES['ORPHAN'] = 'unstable'
     context.basectx.orphan = context.basectx.unstable
+else:
+    TROUBLES['ORPHAN'] = 'orphan'
 
 if not util.safehasattr(context.basectx, 'contentdivergent'):
     context.basectx.contentdivergent = context.basectx.divergent
--- a/tests/test-evolve-cycles.t	Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-evolve-cycles.t	Thu Aug 24 09:11:06 2017 +0200
@@ -50,7 +50,7 @@
 Create a cycle
   $ hg prune -s "desc(B)" "desc(A)"
   1 changesets pruned
-  2 new unstable changesets
+  2 new orphan 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 unstable changesets
+  5 new orphan changesets
   $ hg prune -s "desc(C)" "desc(B)"
   1 changesets pruned
   $ hg prune --split -s "desc(A)" -s "desc(D)" "desc(C)"
--- a/tests/test-evolve-list.t	Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-evolve-list.t	Thu Aug 24 09:11:06 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 unstable changesets
+  2 new orphan changesets
   $ hg evolve --list
   d2ae7f538514: b
     unstable: cb9a9f314b8b (obsolete parent)
--- a/tests/test-evolve-obshistory-complex.t	Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-evolve-obshistory-complex.t	Thu Aug 24 09:11:06 2017 +0200
@@ -68,7 +68,7 @@
 
   $ hg fold --exact -r 1 -r 2 --date "0 0" -m "fold0"
   2 changesets folded
-  4 new unstable changesets
+  4 new orphan 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"
--- a/tests/test-evolve-order.t	Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-evolve-order.t	Thu Aug 24 09:11:06 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 unstable changesets
+  2 new orphan 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 unstable changesets
+  3 new orphan 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 unstable changesets
+  1 new orphan 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 unstable changesets
+  3 new orphan changesets
   $ hg prune "desc(c2_)" -s "desc(c2prime)"
   1 changesets pruned
   $ hg prune "desc(c1prime)" -s "desc(c1second)"
   1 changesets pruned
-  1 new unstable changesets
+  1 new orphan 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 unstable changesets
+  3 new orphan 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 unstable changesets
+  1 new orphan changesets
   $ hg prune -s 'desc(c3part2)' 'desc(c3_)'
   1 changesets pruned
   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 unstable changesets
+  1 new orphan changesets
   $ hg evolve --rev "orphan()"
   move:[30] add b4_
   atop:[35] b3second
--- a/tests/test-evolve-split.t	Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-evolve-split.t	Thu Aug 24 09:11:06 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 unstable changesets
+  1 new orphan changesets
   $ hg log -G
   @  4:d0dcf24cddd3@default(draft) _pp
   |
--- a/tests/test-evolve-topic.t	Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-evolve-topic.t	Thu Aug 24 09:11:06 2017 +0200
@@ -83,7 +83,7 @@
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo ddd >> ddd
   $ hg amend
-  6 new unstable changesets
+  6 new orphan changesets
   $ hg up 'desc(fff)'
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo fff >> fff
--- a/tests/test-evolve.t	Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-evolve.t	Thu Aug 24 09:11:06 2017 +0200
@@ -344,7 +344,7 @@
 (amend of on ancestors)
 
   $ hg amend
-  1 new unstable changesets
+  1 new orphan changesets
   $ hg log
   6	feature-A: a nifty feature - test
   4	feature-B: another feature (child of 568a468b60fc) - test
@@ -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 unstable changesets
+  2 new orphan changesets
 
 (ninja test for the {trouble} template:
 
@@ -831,7 +831,7 @@
   $ hg ci -m c
   $ hg prune .^
   1 changesets pruned
-  1 new unstable changesets
+  1 new orphan 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 unstable changesets
+  1 new orphan 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 unstable changesets
+  2 new orphan changesets
   $ hg evolve
   move:[5] a2
   atop:[7] a1_
@@ -954,7 +954,7 @@
   $ hg up 7
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg ci --amend -m 'a1__'
-  2 new unstable changesets
+  2 new orphan changesets
 
   $ hg up 8
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -1086,7 +1086,7 @@
   o  0	: a0 - test
   
   $ hg amend
-  2 new unstable changesets
+  2 new orphan changesets
   $ hg log -G
   @  18	: a3 - test
   |
@@ -1247,7 +1247,7 @@
   $ echo "hello" > j4
   $ hg add j4
   $ hg amend
-  2 new unstable changesets
+  2 new orphan changesets
   $ glog -r "18::"
   @  25:8dc373be86d9@default(draft) add j1
   |
@@ -1419,7 +1419,7 @@
   $ hg commit -m "_pp"
   $ hg prune --succ "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" --split
   1 changesets pruned
-  1 new unstable changesets
+  1 new orphan changesets
   $ glog -r "18::"
   @  35:7a555adf2b4a@default(draft) _pp
   |
@@ -1463,7 +1463,7 @@
   $ hg update -q 37
   $ echo "amended" > newfile
   $ hg amend -m "amended"
-  2 new unstable changesets
+  2 new orphan changesets
 
   $ hg evolve --rev "37::"
   move:[38] will be evolved safely
--- a/tests/test-exchange-obsmarkers-case-A3.t	Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-A3.t	Thu Aug 24 09:11:06 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 unstable changesets
+  1 new orphan changesets
   ## post pull state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-obsmarkers-case-C1.t	Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-C1.t	Thu Aug 24 09:11:06 2017 +0200
@@ -58,7 +58,7 @@
   $ mkcommit A
   $ mkcommit B
   $ hg prune -qd '0 0' '.~1'
-  1 new unstable changesets
+  1 new orphan changesets
   $ hg prune -qd '0 0' .
   $ hg log -G --hidden
   x  f6fbb35d8ac9 (draft): B
--- a/tests/test-obsolete-push.t	Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-obsolete-push.t	Thu Aug 24 09:11:06 2017 +0200
@@ -26,7 +26,7 @@
   $ hg phase --secret --force .
   $ hg prune 0 1
   2 changesets pruned
-  1 new unstable changesets
+  1 new orphan changesets
   $ glog --hidden
   @  2:244232c2222a@default(secret) C
   |
--- a/tests/test-obsolete.t	Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-obsolete.t	Thu Aug 24 09:11:06 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 unstable changesets
+  1 new orphan changesets
   $ qlog -r 'obsolete()'
   3
   - 0d3f46688ccc
@@ -210,7 +210,7 @@
   working directory parent is obsolete! (0d3f46688ccc)
   $ mkcommit obsol_d # 6
   created new head
-  1 new unstable changesets
+  1 new orphan changesets
   $ hg debugobsolete `getid 5` `getid 6`
   obsoleted 1 changesets
   $ qlog
@@ -269,7 +269,7 @@
   working directory parent is obsolete! (0d3f46688ccc)
   $ mkcommit "obsol_d'" # 7
   created new head
-  1 new unstable changesets
+  1 new orphan 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 unstable changesets
+  1 new orphan changesets
   $ hg debugobsolete `getid 7` `getid 8`
   obsoleted 1 changesets
   $ cd ../other-new
@@ -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 unstable changesets
+  1 new orphan changesets
 
 
 Relevant marker computation
--- a/tests/test-prev-next.t	Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-prev-next.t	Thu Aug 24 09:11:06 2017 +0200
@@ -169,7 +169,7 @@
 some aspiring children
 
   $ hg amend -m 'added b (2)'
-  1 new unstable changesets
+  1 new orphan 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 unstable changesets
+  2 new orphan 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 unstable changesets
+  1 new orphan changesets
   got lock after [4-6] seconds (re)
   move:[2] two
   atop:[3] one
--- a/tests/test-prune.t	Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-prune.t	Thu Aug 24 09:11:06 2017 +0200
@@ -63,7 +63,7 @@
 
   $ hg prune 1
   1 changesets pruned
-  2 new unstable changesets
+  2 new orphan changesets
   $ hg book -i BABAR
   $ hg debugobsolete
   9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '*', 'user': 'blah'} (glob)
--- a/tests/test-split.t	Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-split.t	Thu Aug 24 09:11:06 2017 +0200
@@ -148,7 +148,7 @@
 Split a revision specified with -r
   $ echo "change to b" >> _b
   $ hg amend -m "_cprim"
-  2 new unstable changesets
+  2 new orphan changesets
   $ hg evolve --all
   move:[6] split1
   atop:[9] _cprim
--- a/tests/test-stabilize-conflict.t	Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-stabilize-conflict.t	Thu Aug 24 09:11:06 2017 +0200
@@ -76,7 +76,7 @@
    neuf
    dix
   $ hg amend
-  1 new unstable changesets
+  1 new orphan changesets
   $ hg evolve
   move:[2] babar count up to fifteen
   atop:[4] babar count up to ten
@@ -122,7 +122,7 @@
   -dix
   +ten
   $ hg amend
-  1 new unstable changesets
+  1 new orphan changesets
   $ hg evolve
   move:[5] babar count up to fifteen
   atop:[7] babar count up to ten
@@ -209,7 +209,7 @@
   -ten
   +zehn
   $ hg amend
-  1 new unstable changesets
+  1 new orphan changesets
   $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH
   $ hg evolve --tool touch <<EOF
   > n
--- a/tests/test-stabilize-order.t	Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-stabilize-order.t	Thu Aug 24 09:11:06 2017 +0200
@@ -38,14 +38,14 @@
   [2] addb
   $ echo b >> b
   $ hg amend
-  1 new unstable changesets
+  1 new orphan 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 unstable changesets
+  1 new orphan changesets
   $ glog
   @  7:005fe5914f78@default(draft) adda
   |
@@ -137,7 +137,7 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo b >> b
   $ hg amend
-  1 new unstable changesets
+  1 new orphan 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 unstable changesets
+  2 new orphan changesets
   $ hg log -G
   @  changeset:   15:f83a0bce03e4
   |  tag:         tip
--- a/tests/test-stabilize-result.t	Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-stabilize-result.t	Thu Aug 24 09:11:06 2017 +0200
@@ -27,7 +27,7 @@
   (leaving bookmark changea)
   $ echo a >> a
   $ hg amend -m changea
-  1 new unstable changesets
+  1 new orphan changesets
   $ hg evolve -v --confirm
   move:[2] changea
   atop:[4] changea
@@ -76,7 +76,7 @@
   [4] changea
   $ echo 'a' > a
   $ hg amend
-  1 new unstable changesets
+  1 new orphan changesets
   $ hg evolve
   move:[5] newer a
   atop:[7] changea
--- a/tests/test-topic-tutorial.t	Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-topic-tutorial.t	Thu Aug 24 09:11:06 2017 +0200
@@ -659,7 +659,7 @@
   t0^ add a pair of shoes (base)
 
   $ hg amend -m "Adding hammer to the shopping list"
-  2 new unstable changesets
+  2 new orphan changesets
 
 Understanding the current situation with hg log is not so easy:
 
--- a/tests/test-touch.t	Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-touch.t	Thu Aug 24 09:11:06 2017 +0200
@@ -105,7 +105,7 @@
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   $ hg touch
-  1 new unstable changesets
+  1 new orphan 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 unstable changesets
+  1 new orphan 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 unstable changesets
+  1 new orphan changesets
--- a/tests/test-tutorial.t	Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-tutorial.t	Thu Aug 24 09:11:06 2017 +0200
@@ -650,7 +650,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 unstable changesets
+  1 new orphan changesets
 
 
 The new changeset "animal" is based on an old changeset of "bathroom". You can
@@ -803,7 +803,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory now at a44c85f957d3
   1 changesets pruned
-  1 new unstable changesets
+  1 new orphan changesets
 
 
 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset
--- a/tests/test-uncommit.t	Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-uncommit.t	Thu Aug 24 09:11:06 2017 +0200
@@ -337,7 +337,7 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   [8] touncommit
   $ hg uncommit aa
-  1 new unstable changesets
+  1 new orphan changesets
 
 Test uncommiting agains a different base
 
--- a/tests/test-unstable.t	Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-unstable.t	Thu Aug 24 09:11:06 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 unstable changesets
+  1 new orphan 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 unstable changesets
+  1 new orphan 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 unstable changesets
+  1 new orphan 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 unstable changesets
+  1 new orphan 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 unstable changesets
+  1 new orphan 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 unstable changesets
+  1 new orphan 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 unstable changesets
+  1 new orphan changesets
   $ hg log -G
   @  4:3c69ea6aa93e@default(draft) add bprimesplit2
   |
--- a/tests/test-userguide.t	Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-userguide.t	Thu Aug 24 09:11:06 2017 +0200
@@ -165,7 +165,7 @@
   $ hg update -q 11
   $ echo 'fix fix fix fix' > file2.c
   $ hg amend -u bob -d '6 0'
-  2 new unstable changesets
+  2 new orphan 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 19
   1 changesets pruned
-  1 new unstable changesets
+  1 new orphan changesets
   $ hg --hidden shortlog -G -r 18::
   @  20:ea8fafca914b  draft  more work
   |
@@ -257,7 +257,7 @@
   |
   ~
   $ hg uncommit file2.c
-  1 new unstable changesets
+  1 new orphan changesets
   $ hg status
   M file2.c
   $ hg revert file2.c
@@ -297,7 +297,7 @@
   |
   ~
   $ hg uncommit file2.c
-  1 new unstable changesets
+  1 new orphan changesets
   $ hg status
   M file2.c
   $ hg commit -m 'useful tweak'