--- a/tests/test-stack-branch.t	Tue Aug 28 11:25:32 2018 +0200
+++ b/tests/test-stack-branch.t	Mon Sep 03 22:09:26 2018 +0200
@@ -56,8 +56,8 @@
   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   $ hg stack
   ### target: other (branch)
-  b2@ c_b (current)
-  b1: c_a
+  s2@ c_b (current)
+  s1: c_a
   $ hg phase --public 'branch("other")'
   $ hg up foo
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -71,18 +71,18 @@
   foo
   $ hg stack
   ### target: foo (branch)
-  b4@ c_f (current)
-  b3: c_e
-  b2: c_d
-  b1: c_c
-  b0^ c_b (base)
+  s4@ c_f (current)
+  s3: c_e
+  s2: c_d
+  s1: c_c
+  s0^ c_b (base)
   $ hg stack -v
   ### target: foo (branch)
-  b4(913c298d8b0a)@ c_f (current)
-  b3(4f2a69f6d380): c_e
-  b2(f61adbacd17a): c_d
-  b1(3e9313bc4b71): c_c
-  b0(4a04f1104a27)^ c_b (base)
+  s4(913c298d8b0a)@ c_f (current)
+  s3(4f2a69f6d380): c_e
+  s2(f61adbacd17a): c_d
+  s1(3e9313bc4b71): c_c
+  s0(4a04f1104a27)^ c_b (base)
 
 Test "t#" reference
 -------------------
@@ -92,7 +92,7 @@
   $ hg up foo
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg up b42
-  abort: cannot resolve "b42": branch "foo" has only 4 changesets
+  abort: cannot resolve "b42": branch "foo" has only 4 non-public changesets
   [255]
   $ hg up b2
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
@@ -126,20 +126,20 @@
   
   $ hg stack
   ### target: foo (branch)
-  b4$ c_f (unstable)
-  b3$ c_e (unstable)
-  b2@ c_d (current)
-  b1: c_c
-  b0^ c_b (base)
+  s4$ c_f (unstable)
+  s3$ c_e (unstable)
+  s2@ c_d (current)
+  s1: c_c
+  s0^ c_b (base)
   $ hg up b3
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg stack
   ### target: foo (branch)
-  b4$ c_f (unstable)
-  b3$ c_e (current unstable)
-  b2: c_d
-  b1: c_c
-  b0^ c_b (base)
+  s4$ c_f (unstable)
+  s3$ c_e (current unstable)
+  s2: c_d
+  s1: c_c
+  s0^ c_b (base)
   $ hg up b2
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
@@ -207,14 +207,14 @@
 
   $ hg stack
   ### target: foo (branch) (2 heads)
-  b6: c_f
-  b5: c_e
-  b2^ c_d (base)
-  b4@ c_h (current)
-  b3: c_g
-  b2: c_d
-  b1: c_c
-  b0^ c_b (base)
+  s6: c_f
+  s5: c_e
+  s2^ c_d (base)
+  s4@ c_h (current)
+  s3: c_g
+  s2: c_d
+  s1: c_c
+  s0^ c_b (base)
 
 Case with multiple heads on the topic with unstability involved
 ---------------------------------------------------------------
@@ -250,14 +250,14 @@
 
   $ hg stack
   ### target: foo (branch) (2 heads)
-  b6$ c_f (unstable)
-  b5$ c_e (unstable)
-  b2^ c_D (base current)
-  b4: c_h
-  b3: c_g
-  b2@ c_D (current)
-  b1: c_c
-  b0^ c_b (base)
+  s6$ c_f (unstable)
+  s5$ c_e (unstable)
+  s2^ c_D (base current)
+  s4: c_h
+  s3: c_g
+  s2@ c_D (current)
+  s1: c_c
+  s0^ c_b (base)
 
 Check that stack doesn't show draft changesets on a branch
 ----------------------------------------------------------
@@ -284,24 +284,24 @@
 
   $ hg stack
   ### target: foo (branch) (2 heads)
-  b6$ c_f (unstable)
-  b5$ c_e (unstable)
-  b2^ c_D (base current)
-  b4: c_h
-  b3: c_g
-  b2@ c_D (current)
-  b1: c_c
-  b0^ c_b (base)
+  s6$ c_f (unstable)
+  s5$ c_e (unstable)
+  s2^ c_D (base current)
+  s4: c_h
+  s3: c_g
+  s2@ c_D (current)
+  s1: c_c
+  s0^ c_b (base)
   $ hg phase --public b1
   $ hg stack
   ### target: foo (branch) (2 heads)
-  b5$ c_f (unstable)
-  b4$ c_e (unstable)
-  b1^ c_D (base current)
-  b3: c_h
-  b2: c_g
-  b1@ c_D (current)
-  b0^ c_c (base)
+  s5$ c_f (unstable)
+  s4$ c_e (unstable)
+  s1^ c_D (base current)
+  s3: c_h
+  s2: c_g
+  s1@ c_D (current)
+  s0^ c_c (base)
 
 Check that stack doesn't show changeset with a topic
 ----------------------------------------------------
@@ -310,7 +310,7 @@
   changed topic on 2 changes
   $ hg stack
   ### target: foo (branch)
-  b3: c_h
-  b2: c_g
-  b1@ c_D (current)
-  b0^ c_c (base)
+  s3: c_h
+  s2: c_g
+  s1@ c_D (current)
+  s0^ c_c (base)