Mercurial > evolve
diff tests/test-stack-branch.t @ 4067:fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
If we want people to use it, we should display it.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 03 Sep 2018 17:07:36 +0200 |
parents | 1aa5f851d2c0 |
children | f9a850018daa d5a2cc19903f |
line wrap: on
line diff
--- a/tests/test-stack-branch.t Mon Sep 03 16:41:32 2018 +0200 +++ b/tests/test-stack-branch.t Mon Sep 03 17:07:36 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 ------------------- @@ -127,20 +127,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 @@ -208,14 +208,14 @@ $ hg stack ### target: foo (branch) (2 heads) - b6@ c_h (current) - b5: c_g - b2^ c_d (base) - b4: c_f - b3: c_e - b2: c_d - b1: c_c - b0^ c_b (base) + s6@ c_h (current) + s5: c_g + s2^ c_d (base) + s4: c_f + s3: c_e + s2: c_d + s1: c_c + s0^ c_b (base) Case with multiple heads on the topic with unstability involved --------------------------------------------------------------- @@ -252,14 +252,14 @@ $ hg stack ### target: foo (branch) (2 heads) - b6: c_h - b5: c_g - b2^ c_D (base current) - b4$ c_f (unstable) - b3$ c_e (unstable) - b2@ c_D (current) - b1: c_c - b0^ c_b (base) + s6: c_h + s5: c_g + s2^ c_D (base current) + s4$ c_f (unstable) + s3$ c_e (unstable) + s2@ c_D (current) + s1: c_c + s0^ c_b (base) Check that stack doesn't show draft changesets on a branch ---------------------------------------------------------- @@ -286,24 +286,24 @@ $ hg stack ### target: foo (branch) (2 heads) - b6: c_h - b5: c_g - b2^ c_D (base current) - b4$ c_f (unstable) - b3$ c_e (unstable) - b2@ c_D (current) - b1: c_c - b0^ c_b (base) + s6: c_h + s5: c_g + s2^ c_D (base current) + s4$ c_f (unstable) + s3$ c_e (unstable) + s2@ c_D (current) + s1: c_c + s0^ c_b (base) $ hg phase --public b1 $ hg stack ### target: foo (branch) (2 heads) - b5: c_h - b4: c_g - b1^ c_D (base current) - b3$ c_f (unstable) - b2$ c_e (unstable) - b1@ c_D (current) - b0^ c_c (base) + s5: c_h + s4: c_g + s1^ c_D (base current) + s3$ c_f (unstable) + s2$ c_e (unstable) + s1@ c_D (current) + s0^ c_c (base) Check that stack doesn't show changeset with a topic ---------------------------------------------------- @@ -312,7 +312,7 @@ changed topic on 2 changes $ hg stack ### target: foo (branch) - b3$ c_f (unstable) - b2$ c_e (unstable) - b1@ c_D (current) - b0^ c_c (base) + s3$ c_f (unstable) + s2$ c_e (unstable) + s1@ c_D (current) + s0^ c_c (base)