Mercurial > evolve

comparison tests/test-topic-stack-data.t @ 3930:d00f0c369bc7 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 Thu, 02 Aug 2018 02:47:44 +0200
parents d5adce52cef4 1bc4b0807c37
children 537fd9a86c06 f9a850018daa
comparison
equal deleted inserted replaced
3929:e709e3817d7e 3930:d00f0c369bc7
73 $ mkcommit fuz_b 73 $ mkcommit fuz_b
74 $ mkcommit fuz_c 74 $ mkcommit fuz_c
75 $ hg up 'desc(fuz_a)' 75 $ hg up 'desc(fuz_a)'
76 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 76 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
77 $ hg commit --amend --message 'fuz1_a' 77 $ hg commit --amend --message 'fuz1_a'
78 2 new orphan changesets
79 78
80 A topic with multiple heads 79 A topic with multiple heads
81 80
82 $ hg up 'desc(base_e)' 81 $ hg up 'desc(base_e)'
83 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 82 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
93 $ mkcommit bar_d 92 $ mkcommit bar_d
94 $ mkcommit bar_e 93 $ mkcommit bar_e
95 $ hg up 'desc(bar_d)' 94 $ hg up 'desc(bar_d)'
96 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 95 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
97 $ hg commit --amend --message 'bar1_d' 96 $ hg commit --amend --message 'bar1_d'
98 1 new orphan changesets
99 97
100 topic 'foo' on the multi headed branch 98 topic 'foo' on the multi headed branch
101 99
102 $ hg up 'desc(lake_a)' 100 $ hg up 'desc(lake_a)'
103 1 files updated, 0 files merged, 7 files removed, 0 files unresolved 101 1 files updated, 0 files merged, 7 files removed, 0 files unresolved
125 | 123 |
126 o add foo_a (lake) [foo] 124 o add foo_a (lake) [foo]
127 | 125 |
128 | o bar1_d (default) [bar] 126 | o bar1_d (default) [bar]
129 | | 127 | |
130 | | * add bar_e (default) [bar] 128 | | o add bar_e (default) [bar]
131 | | | 129 | | |
132 | | x add bar_d (default) [bar] 130 | | x add bar_d (default) [bar]
133 | |/ 131 | |/
134 | | o add bar_c (default) [bar] 132 | | o add bar_c (default) [bar]
135 | |/ 133 | |/
137 | | 135 | |
138 | o add bar_a (default) [bar] 136 | o add bar_a (default) [bar]
139 | | 137 | |
140 | | o fuz1_a (default) [fuz] 138 | | o fuz1_a (default) [fuz]
141 | | | 139 | | |
142 | | | * add fuz_c (default) [fuz] 140 | | | o add fuz_c (default) [fuz]
143 | | | | 141 | | | |
144 | | | * add fuz_b (default) [fuz] 142 | | | o add fuz_b (default) [fuz]
145 | | | | 143 | | | |
146 | | | x add fuz_a (default) [fuz] 144 | | | x add fuz_a (default) [fuz]
147 | | |/ 145 | | |/
148 | | | o add baz_b (default) [baz] 146 | | | o add baz_b (default) [baz]
149 | | | | 147 | | | |