Mercurial > evolve

comparison tests/test-topic-dest.t @ 5892:34cd08a46b6d mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.7 into mercurial-5.6
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 24 Apr 2021 20:01:39 +0800
parents 03410b04cf10
children 82da27321e91 43c4db536990
comparison
equal deleted inserted replaced
5891:b13cb2d500ae 5892:34cd08a46b6d
111 111
112 $ hg up elephant 112 $ hg up elephant
113 switching to topic elephant 113 switching to topic elephant
114 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 114 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
115 $ hg rebase 115 $ hg rebase
116 rebasing 4:cb7ae72f4a80 elephant "babar" 116 rebasing 4:cb7ae72f4a80 "babar" (elephant)
117 switching to topic elephant 117 switching to topic elephant
118 $ hg log -G 118 $ hg log -G
119 @ 7 (elephant) babar 119 @ 7 (elephant) babar
120 | 120 |
121 o 6 () c_epsilon 121 o 6 () c_epsilon
132 132
133 $ hg up monkey 133 $ hg up monkey
134 switching to topic monkey 134 switching to topic monkey
135 1 files updated, 0 files merged, 3 files removed, 0 files unresolved 135 1 files updated, 0 files merged, 3 files removed, 0 files unresolved
136 $ hg rebase 136 $ hg rebase
137 rebasing 5:d832ddc604ec monkey "zephir" 137 rebasing 5:d832ddc604ec "zephir" (monkey)
138 switching to topic monkey 138 switching to topic monkey
139 $ hg log -G 139 $ hg log -G
140 @ 8 (monkey) zephir 140 @ 8 (monkey) zephir
141 | 141 |
142 | o 7 (elephant) babar 142 | o 7 (elephant) babar
175 o 1 () c_beta 175 o 1 () c_beta
176 | 176 |
177 o 0 () c_alpha 177 o 0 () c_alpha
178 178
179 $ hg rebase 179 $ hg rebase
180 rebasing 9:d79a104e2902 tip monkey "Huc" 180 rebasing 9:d79a104e2902 "Huc" (tip monkey)
181 $ hg log -G 181 $ hg log -G
182 @ 10 (monkey) Huc 182 @ 10 (monkey) Huc
183 | 183 |
184 o 8 (monkey) zephir 184 o 8 (monkey) zephir
185 | 185 |
227 227
228 $ hg up elephant 228 $ hg up elephant
229 switching to topic elephant 229 switching to topic elephant
230 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 230 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
231 $ hg rebase -d 'desc(c_zeta)' # make sure tip is elsewhere 231 $ hg rebase -d 'desc(c_zeta)' # make sure tip is elsewhere
232 rebasing 7:8d0b77140b05 elephant "babar" 232 rebasing 7:8d0b77140b05 "babar" (elephant)
233 switching to topic elephant 233 switching to topic elephant
234 $ hg up monkey 234 $ hg up monkey
235 switching to topic monkey 235 switching to topic monkey
236 2 files updated, 0 files merged, 1 files removed, 0 files unresolved 236 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
237 $ hg merge 237 $ hg merge