--- a/tests/test-stack-branch.t Wed Apr 10 16:11:59 2019 +0200
+++ b/tests/test-stack-branch.t Thu Apr 11 22:13:55 2019 +0200
@@ -105,7 +105,7 @@
phases: 4 draft
Case with some of the branch unstable
-------------------------------------
+-------------------------------------
$ echo bbb > ddd
$ hg commit --amend
@@ -127,8 +127,8 @@
$ hg stack
### target: foo (branch)
- s4$ c_f (unstable)
- s3$ c_e (unstable)
+ s4$ c_f (orphan)
+ s3$ c_e (orphan)
s2@ c_d (current)
s1: c_c
s0^ c_b (base)
@@ -136,8 +136,8 @@
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg stack
### target: foo (branch)
- s4$ c_f (unstable)
- s3$ c_e (current unstable)
+ s4$ c_f (orphan)
+ s3@ c_e (current orphan)
s2: c_d
s1: c_c
s0^ c_b (base)
@@ -217,7 +217,7 @@
s1: c_c
s0^ c_b (base)
-Case with multiple heads on the topic with unstability involved
+Case with multiple heads on the topic with instability involved
---------------------------------------------------------------
We amend the message to make sure the display base pick the right changeset
@@ -255,8 +255,8 @@
s6: c_h
s5: c_g
s2^ c_D (base current)
- s4$ c_f (unstable)
- s3$ c_e (unstable)
+ s4$ c_f (orphan)
+ s3$ c_e (orphan)
s2@ c_D (current)
s1: c_c
s0^ c_b (base)
@@ -289,8 +289,8 @@
s6: c_h
s5: c_g
s2^ c_D (base current)
- s4$ c_f (unstable)
- s3$ c_e (unstable)
+ s4$ c_f (orphan)
+ s3$ c_e (orphan)
s2@ c_D (current)
s1: c_c
s0^ c_b (base)
@@ -300,8 +300,8 @@
s5: c_h
s4: c_g
s1^ c_D (base current)
- s3$ c_f (unstable)
- s2$ c_e (unstable)
+ s3$ c_f (orphan)
+ s2$ c_e (orphan)
s1@ c_D (current)
s0^ c_c (base)
@@ -312,7 +312,7 @@
changed topic on 2 changesets to "sometopic"
$ hg stack
### target: foo (branch)
- s3$ c_f (unstable)
- s2$ c_e (unstable)
+ s3$ c_f (orphan)
+ s2$ c_e (orphan)
s1@ c_D (current)
s0^ c_c (base)