diff tests/test-topic-stack-data.t @ 4076:f9a850018daa mercurial-4.4

test-compat: merge mercurial-4.5 into mercurial-4.4

--- a/tests/test-topic-stack-data.t	Tue Aug 28 11:24:52 2018 +0200
+++ b/tests/test-topic-stack-data.t	Mon Sep 03 22:06:12 2018 +0200
@@ -262,39 +262,39 @@
   $ hg stack bar
   ### topic: bar (2 heads)
   ### target: default (branch)
-  t5: add bar_c
-  t2^ add bar_b (base)
-  t4$ add bar_e (unstable)
-  t3: bar1_d
-  t2: add bar_b
-  t1: add bar_a
-  t0^ add base_e (base)
+  s5: add bar_c
+  s2^ add bar_b (base)
+  s4$ add bar_e (unstable)
+  s3: bar1_d
+  s2: add bar_b
+  s1: add bar_a
+  s0^ add base_e (base)
   $ hg stack bar -v
   ### topic: bar (2 heads)
   ### target: default (branch)
-  t5(9cbadf11b44d): add bar_c
-  t2(e555c7e8c767)^ add bar_b (base)
-  t4(a920412b5a05)$ add bar_e (unstable)
-  t3(6915989374b1): bar1_d
-  t2(e555c7e8c767): add bar_b
-  t1(a5c2b4e00bbf): add bar_a
-  t0(92f489a6251f)^ add base_e (base)
+  s5(9cbadf11b44d): add bar_c
+  s2(e555c7e8c767)^ add bar_b (base)
+  s4(a920412b5a05)$ add bar_e (unstable)
+  s3(6915989374b1): bar1_d
+  s2(e555c7e8c767): add bar_b
+  s1(a5c2b4e00bbf): add bar_a
+  s0(92f489a6251f)^ add base_e (base)
   $ hg stack baz
   ### topic: baz
   ### target: default (branch), 2 behind
-  t2: add baz_b
-  t1: add baz_a
-  t0^ add base_c (base)
+  s2: add baz_b
+  s1: add baz_a
+  s0^ add base_c (base)
   $ hg stack foo
   ### topic: foo
   ### target: lake (branch), ambiguous rebase destination - branch 'lake' has 2 heads
-  t2@ add foo_b (current)
-  t1: add foo_a
-  t0^ add lake_a (base)
+  s2@ add foo_b (current)
+  s1: add foo_a
+  s0^ add lake_a (base)
   $ hg stack fuz
   ### topic: fuz
   ### target: default (branch), 1 behind
-  t3$ add fuz_c (unstable)
-  t2$ add fuz_b (unstable)
-  t1: fuz1_a
-  t0^ add base_d (base)
+  s3$ add fuz_c (unstable)
+  s2$ add fuz_b (unstable)
+  s1: fuz1_a
+  s0^ add base_d (base)