Mercurial > evolve
diff tests/test-topic-stack-complex.t @ 4076:f9a850018daa mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 03 Sep 2018 22:06:12 +0200 |
| parents | d5adce52cef4 fb4801478d5d |
| children | 9c025ec4af88 e268f7fd7839 |
line wrap: on
line diff
--- a/tests/test-topic-stack-complex.t Tue Aug 28 11:24:52 2018 +0200 +++ b/tests/test-topic-stack-complex.t Mon Sep 03 22:06:12 2018 +0200 @@ -42,10 +42,10 @@ $ hg stack ### topic: foo ### target: default (branch) - t3@ Added e and f (current) - t2: Added c and d - t1: Added a and b - t0^ Added foo (base) + s3@ Added e and f (current) + s2: Added c and d + s1: Added a and b + s0^ Added foo (base) $ hg prev 0 files updated, 0 files merged, 2 files removed, 0 files unresolved [2] Added c and d @@ -85,11 +85,11 @@ $ hg stack ### topic: foo ### target: default (branch) - t4$ Added e and f (unstable) - t3@ split2 (current) - t2: split1 - t1: Added a and b - t0^ Added foo (base) + s4$ Added e and f (unstable) + s3@ split2 (current) + s2: split1 + s1: Added a and b + s0^ Added foo (base) $ hg show work @ 5cce (foo) split2 @@ -128,8 +128,8 @@ $ hg stack ### topic: foo (2 heads) ### target: default (branch), 2 behind - t4$ Added e and f (unstable) - t3$ split2 (unstable) - t2@ split1 (current) - t1: Added a and b - t0^ Added foo (base) + s4$ Added e and f (unstable) + s3$ split2 (unstable) + s2@ split1 (current) + s1: Added a and b + s0^ Added foo (base)