tests/test-topic-rebase.t
branchmercurial-4.3
changeset 4077 9c025ec4af88
parent 3936 537fd9a86c06
parent 4067 fb4801478d5d
--- a/tests/test-topic-rebase.t	Tue Aug 28 11:25:32 2018 +0200
+++ b/tests/test-topic-rebase.t	Mon Sep 03 22:09:26 2018 +0200
@@ -47,8 +47,8 @@
   $ hg stack
   ### topic: myfeature
   ### target: default (branch)
-  t1@ add feature1 (current)
-  t0^ add ROOT (base)
+  s1@ add feature1 (current)
+  s0^ add ROOT (base)
   $ logtopic
   @  1:39e7a938055e87615edf675c24a10997ff05bb06
   |  topics: myfeature
@@ -77,8 +77,8 @@
   $ hg stack
   ### topic: myfeature
   ### target: default (branch)
-  t1@ add feature1 (current)
-  t0^ add default (base)
+  s1@ add feature1 (current)
+  s0^ add default (base)
   $ logtopic
   @  3:fc6593661cf3256ba165cbccd6019ead17cc3726
   |  topics: myfeature
@@ -91,8 +91,8 @@
   $ hg stack
   ### topic: myfeature
   ### target: default (branch)
-  t1@ add feature1 (current)
-  t0^ add default (base)
+  s1@ add feature1 (current)
+  s0^ add default (base)
 
 Check that rebase keep the topic in case of merge conflict
 ----------------------------------------------------------
@@ -157,12 +157,12 @@
   $ hg stack
   ### topic: myotherfeature
   ### target: default (branch)
-  t1@ myotherfeature1 (current)
-  t0^ default3 (base)
+  s1@ myotherfeature1 (current)
+  s0^ default3 (base)
   $ hg update --rev 7
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg stack
   ### topic: myotherfeature
   ### target: default (branch)
-  t1@ myotherfeature1 (current)
-  t0^ default3 (base)
+  s1@ myotherfeature1 (current)
+  s0^ default3 (base)