evolve: comparison tests/test-stack-branch.t

equal deleted inserted replaced

-:55ca0b6276e7
+:e6ee830c4f45
 ------------------------------------
 $ echo bbb > ddd
 $ hg commit --amend
 $ hg log -G
-@  6 foo {} draft c_d
+@  7 foo {} draft c_d
 |
 | o  5 foo {} draft c_f
 | |
 | o  4 foo {} draft c_e
 | |
 Also test the revset:
 $ hg log -r 'stack()'
 2 foo {} draft c_c
-6 foo {} draft c_d
+7 foo {} draft c_d
 4 foo {} draft c_e
 5 foo {} draft c_f
 Case with multiple heads on the topic
 -------------------------------------
 $ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()'
 rebasing 4:4f2a69f6d380 "c_e"
 rebasing 5:913c298d8b0a "c_f"
 $ hg log -G
-o  8 foo {} draft c_f
+o  9 foo {} draft c_f
 |
-o  7 foo {} draft c_e
+o  8 foo {} draft c_e
 |
-@  6 foo {} draft c_d
+@  7 foo {} draft c_d
 |
 o  2 foo {} draft c_c
 |
 o  1 other {} public c_b
 |
 (consider using topic for lightweight branches. See 'hg help topic')
 $ echo aaa > hhh
 $ hg add hhh
 $ hg commit -m c_h
 $ hg log -G
-@  10 foo {} draft c_h
+@  11 foo {} draft c_h
 |
-o  9 foo {} draft c_g
+o  10 foo {} draft c_g
 |
-| o  8 foo {} draft c_f
+| o  9 foo {} draft c_f
 | |
-| o  7 foo {} draft c_e
+| o  8 foo {} draft c_e
 |/
-o  6 foo {} draft c_d
+o  7 foo {} draft c_d
 |
 o  2 foo {} draft c_c
 |
 o  1 other {} public c_b
 |
 Test output
 $ hg stack
 ### target: foo (branch) (2 heads)
-s6@ c_h (current)
+s6: c_f
-s5: c_g
+s5: c_e
 s2^ c_d (base)
-s4: c_f
+s4@ c_h (current)
-s3: c_e
+s3: c_g
 s2: c_d
 s1: c_c
 s0^ c_b (base)
 Case with multiple heads on the topic with unstability involved
 $ hg up 'desc(c_d)'
 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 $ echo ccc > ddd
 $ hg commit --amend -m 'c_D'
 $ hg rebase -d . -s 'desc(c_g)'
-rebasing 9:2ebb6e48ab8a "c_g"
+rebasing 10:2ebb6e48ab8a "c_g"
-rebasing 10:634f38e27a1d "c_h"
+rebasing 11:634f38e27a1d "c_h"
 $ hg log -G
-o  13 foo {} draft c_h
+o  15 foo {} draft c_h
 |
-o  12 foo {} draft c_g
+o  14 foo {} draft c_g
 |
-@  11 foo {} draft c_D
+@  13 foo {} draft c_D
 |
-| o  8 foo {} draft c_f
+| o  9 foo {} draft c_f
 | |
-| o  7 foo {} draft c_e
+| o  8 foo {} draft c_e
 | |
-| x  6 foo {} draft c_d
+| x  7 foo {} draft c_d
 |/
 o  2 foo {} draft c_c
 |
 o  1 other {} public c_b
 |
 o  0 other {} public c_a
 $ hg stack
 ### target: foo (branch) (2 heads)
-s6: c_h
+s6$ c_f (unstable)
-s5: c_g
+s5$ c_e (unstable)
 s2^ c_D (base current)
-s4$ c_f (unstable)
+s4: c_h
-s3$ c_e (unstable)
+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
 ----------------------------------------------------------
 $ hg log --graph
-o  13 foo {} draft c_h
+o  15 foo {} draft c_h
 |
-o  12 foo {} draft c_g
+o  14 foo {} draft c_g
 |
-@  11 foo {} draft c_D
+@  13 foo {} draft c_D
 |
-| o  8 foo {} draft c_f
+| o  9 foo {} draft c_f
 | |
-| o  7 foo {} draft c_e
+| o  8 foo {} draft c_e
 | |
-| x  6 foo {} draft c_d
+| x  7 foo {} draft c_d
 |/
 o  2 foo {} draft c_c
 |
 o  1 other {} public c_b
 |
 o  0 other {} public c_a
 $ hg stack
 ### target: foo (branch) (2 heads)
-s6: c_h
+s6$ c_f (unstable)
-s5: c_g
+s5$ c_e (unstable)
 s2^ c_D (base current)
-s4$ c_f (unstable)
+s4: c_h
-s3$ c_e (unstable)
+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)
-s5: c_h
+s5$ c_f (unstable)
-s4: c_g
+s4$ c_e (unstable)
 s1^ c_D (base current)
-s3$ c_f (unstable)
+s3: c_h
-s2$ c_e (unstable)
+s2: c_g
 s1@ c_D (current)
 s0^ c_c (base)
 Check that stack doesn't show changeset with a topic
 ----------------------------------------------------
 $ hg topic --rev b4::b5 sometopic
 changed topic on 2 changes
 $ hg stack
 ### target: foo (branch)
-s3$ c_f (unstable)
+s3: c_h
-s2$ c_e (unstable)
+s2: c_g
 s1@ c_D (current)
 s0^ c_c (base)

branch	mercurial-4.3
changeset 4316	e6ee830c4f45
parent 4077	9c025ec4af88