Mercurial > evolve

comparison tests/test-topic-stack-complex.t @ 4076:f9a850018daa mercurial-4.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
4032:fc065ec30351 4076:f9a850018daa
40 Testing in case of split within the topic 40 Testing in case of split within the topic
41 41
42 $ hg stack 42 $ hg stack
43 ### topic: foo 43 ### topic: foo
44 ### target: default (branch) 44 ### target: default (branch)
45 t3@ Added e and f (current) 45 s3@ Added e and f (current)
46 t2: Added c and d 46 s2: Added c and d
47 t1: Added a and b 47 s1: Added a and b
48 t0^ Added foo (base) 48 s0^ Added foo (base)
49 $ hg prev 49 $ hg prev
50 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 50 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
51 [2] Added c and d 51 [2] Added c and d
52 52
53 $ echo 0 > num 53 $ echo 0 > num
83 Done splitting? [yN] y 83 Done splitting? [yN] y
84 84
85 $ hg stack 85 $ hg stack
86 ### topic: foo 86 ### topic: foo
87 ### target: default (branch) 87 ### target: default (branch)
88 t4$ Added e and f (unstable) 88 s4$ Added e and f (unstable)
89 t3@ split2 (current) 89 s3@ split2 (current)
90 t2: split1 90 s2: split1
91 t1: Added a and b 91 s1: Added a and b
92 t0^ Added foo (base) 92 s0^ Added foo (base)
93 93
94 $ hg show work 94 $ hg show work
95 @ 5cce (foo) split2 95 @ 5cce (foo) split2
96 o f26c (foo) split1 96 o f26c (foo) split1
97 | o f1d3 (foo) Added e and f 97 | o f1d3 (foo) Added e and f
126 o f360 Added foo 126 o f360 Added foo
127 127
128 $ hg stack 128 $ hg stack
129 ### topic: foo (2 heads) 129 ### topic: foo (2 heads)
130 ### target: default (branch), 2 behind 130 ### target: default (branch), 2 behind
131 t4$ Added e and f (unstable) 131 s4$ Added e and f (unstable)
132 t3$ split2 (unstable) 132 s3$ split2 (unstable)
133 t2@ split1 (current) 133 s2@ split1 (current)
134 t1: Added a and b 134 s1: Added a and b
135 t0^ Added foo (base) 135 s0^ Added foo (base)