Mercurial > evolve

comparison tests/test-topic-stack-complex.t @ 3287:4303a46b4167 mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge stable into mercurial-4.3
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 11 Dec 2017 16:32:03 +0100
parents e4c0332ecee4
children b714709afe6a 85cdce113c2c
comparison
equal deleted inserted replaced
3286:76c447d88d9a 3287:4303a46b4167
30 $ hg ci -Aqm "Added c and d" 30 $ hg ci -Aqm "Added c and d"
31 $ echo e > e 31 $ echo e > e
32 $ echo f > f 32 $ echo f > f
33 $ hg ci -Aqm "Added e and f" 33 $ hg ci -Aqm "Added e and f"
34 $ hg show work 34 $ hg show work
35 @ f1d3 (foo) Added e and f 35 @ f1d36 (foo) Added e and f
36 o 8e82 (foo) Added c and d 36 o 8e825 (foo) Added c and d
37 o 002b (foo) Added a and b 37 o 002b8 (foo) Added a and b
38 o f360 Added foo 38 o f3603 Added foo
39 39
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
90 t2: split1 90 t2: split1
91 t1: Added a and b 91 t1: Added a and b
92 t0^ Added foo (base) 92 t0^ Added foo (base)
93 93
94 $ hg show work 94 $ hg show work
95 @ 5cce (foo) split2 95 @ 5ccee (foo) split2
96 o f26c (foo) split1 96 o f26c1 (foo) split1
97 | o f1d3 (foo) Added e and f 97 | o f1d36 (foo) Added e and f
98 | x 8e82 (foo) Added c and d 98 | x 8e825 (foo) Added c and d
99 |/ 99 |/
100 o 002b (foo) Added a and b 100 o 002b8 (foo) Added a and b
101 o f360 Added foo 101 o f3603 Added foo
102 102
103 $ hg prev 103 $ hg prev
104 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 104 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
105 [4] split1 105 [4] split1
106 $ echo foo > c 106 $ echo foo > c
111 @@ -1,1 +1,1 @@ 111 @@ -1,1 +1,1 @@
112 -c 112 -c
113 +foo 113 +foo
114 114
115 $ hg amend 115 $ hg amend
116 1 new orphan changesets 116 1 new unstable changesets
117 $ hg show work 117 $ hg show work
118 @ 7d94 (foo) split1 118 @ 7d944 (foo) split1
119 | o 5cce (foo) split2 119 | o 5ccee (foo) split2
120 | x f26c (foo) split1 120 | x f26c1 (foo) split1
121 |/ 121 |/
122 | o f1d3 (foo) Added e and f 122 | o f1d36 (foo) Added e and f
123 | x 8e82 (foo) Added c and d 123 | x 8e825 (foo) Added c and d
124 |/ 124 |/
125 o 002b (foo) Added a and b 125 o 002b8 (foo) Added a and b
126 o f360 Added foo 126 o f3603 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 t4$ Added e and f (unstable)