Mercurial > evolve

comparison tests/test-evolve-continue.t @ 4363:a2fdbece7ce1 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 Tue, 22 Jan 2019 12:57:25 -0500
parents e268f7fd7839
children f54bb6eaf5e6
comparison
equal deleted inserted replaced
4362:8bd60e09dfb4 4363:a2fdbece7ce1
36 $ hg up ca1b80f7960a 36 $ hg up ca1b80f7960a
37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
38 $ echo bar > d 38 $ echo bar > d
39 $ hg add d 39 $ hg add d
40 $ hg amend 40 $ hg amend
41 1 new orphan changesets
42 $ hg glog 41 $ hg glog
43 @ 5:cb6a2ab625bb added c 42 @ 5:cb6a2ab625bb added c
44 | () draft 43 | () draft
45 | * 4:c41c793e0ef1 added d 44 | o 4:c41c793e0ef1 added d
46 | | () draft 45 | | () draft
47 | x 3:ca1b80f7960a added c 46 | x 3:ca1b80f7960a added c
48 |/ () draft 47 |/ () draft
49 o 2:b1661037fa25 added b 48 o 2:b1661037fa25 added b
50 | () draft 49 | () draft
90 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 89 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
91 [6] added d 90 [6] added d
92 $ echo bar > e 91 $ echo bar > e
93 $ hg add e 92 $ hg add e
94 $ hg amend 93 $ hg amend
95 1 new orphan changesets
96 94
97 $ hg glog 95 $ hg glog
98 @ 8:00a5c774cc37 added d 96 @ 8:00a5c774cc37 added d
99 | () draft 97 | () draft
100 | * 7:ad0a59d83efe added e 98 | o 7:ad0a59d83efe added e
101 | | () draft 99 | | () draft
102 | x 6:2a4e03d422e2 added d 100 | x 6:2a4e03d422e2 added d
103 |/ () draft 101 |/ () draft
104 o 5:cb6a2ab625bb added c 102 o 5:cb6a2ab625bb added c
105 | () draft 103 | () draft
145 $ hg up c7586e2a9264 143 $ hg up c7586e2a9264
146 0 files updated, 0 files merged, 4 files removed, 0 files unresolved 144 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
147 $ echo bar > b 145 $ echo bar > b
148 $ hg add b 146 $ hg add b
149 $ hg amend 147 $ hg amend
150 3 new orphan changesets
151 148
152 $ hg evolve --all 149 $ hg evolve --all
153 move:[2] added b 150 move:[2] added b
154 atop:[9] added a 151 atop:[9] added a
155 merging b 152 merging b
208 205
209 $ echo bar > f 206 $ echo bar > f
210 $ echo bar > h 207 $ echo bar > h
211 $ hg add f h 208 $ hg add f h
212 $ hg amend 209 $ hg amend
213 4 new orphan changesets
214 210
215 $ hg glog 211 $ hg glog
216 @ 16:645135c5caa4 added c 212 @ 16:645135c5caa4 added c
217 | () draft 213 | () draft
218 | * 15:09becba8f97d added h 214 | o 15:09becba8f97d added h
219 | | () draft 215 | | () draft
220 | * 14:5aa7b2bbd944 added g 216 | o 14:5aa7b2bbd944 added g
221 | | () draft 217 | | () draft
222 | * 13:be88f889b6dc added f 218 | o 13:be88f889b6dc added f
223 | | () draft 219 | | () draft
224 | * 12:6642d2c9176e added d 220 | o 12:6642d2c9176e added d
225 | | () draft 221 | | () draft
226 | x 11:95665a2de664 added c 222 | x 11:95665a2de664 added c
227 |/ () draft 223 |/ () draft
228 o 10:87f748868183 added b 224 o 10:87f748868183 added b
229 | () draft 225 | () draft
286 $ hg up 5794f1a3cbb2 282 $ hg up 5794f1a3cbb2
287 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 283 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
288 $ echo bar > g 284 $ echo bar > g
289 $ hg add g 285 $ hg add g
290 $ hg amend 286 $ hg amend
291 2 new orphan changesets
292 287
293 $ hg evolve --all --confirm<<EOF 288 $ hg evolve --all --confirm<<EOF
294 > y 289 > y
295 > EOF 290 > EOF
296 move:[19] added g 291 move:[19] added g
339 334
340 $ hg up .^^ 335 $ hg up .^^
341 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 336 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
342 $ echo foobar > g 337 $ echo foobar > g
343 $ hg amend 338 $ hg amend
344 2 new orphan changesets
345 339
346 $ hg next --evolve 340 $ hg next --evolve
347 move:[22] added g 341 move:[22] added g
348 atop:[24] added f 342 atop:[24] added f
349 merging g 343 merging g