Mercurial > evolve

comparison tests/test-evolve-orphan-merge.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 79bc0f1a832e
comparison
equal deleted inserted replaced
4362:8bd60e09dfb4 4363:a2fdbece7ce1
49 49
50 $ hg up d76850646258 50 $ hg up d76850646258
51 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 51 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
52 $ echo bar > b 52 $ echo bar > b
53 $ hg amend 53 $ hg amend
54 1 new orphan changesets
55 54
56 $ hg glog 55 $ hg glog
57 @ 4:64370c9805e7 added b 56 @ 4:64370c9805e7 added b
58 | () draft 57 | () draft
59 | * 3:3b2b6f4652ee merging a and b 58 | o 3:3b2b6f4652ee merging a and b
60 | |\ () draft 59 | |\ () draft
61 +---x 2:d76850646258 added b 60 +---x 2:d76850646258 added b
62 | | () draft 61 | | () draft
63 | o 1:c7586e2a9264 added a 62 | o 1:c7586e2a9264 added a
64 |/ () draft 63 |/ () draft
94 93
95 $ hg up c7586e2a9264 94 $ hg up c7586e2a9264
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 $ echo bar > a 96 $ echo bar > a
98 $ hg amend 97 $ hg amend
99 1 new orphan changesets
100 98
101 $ hg glog 99 $ hg glog
102 @ 6:3d41537b44ca added a 100 @ 6:3d41537b44ca added a
103 | () draft 101 | () draft
104 | * 5:91fd62122a4b merging a and b 102 | o 5:91fd62122a4b merging a and b
105 | |\ () draft 103 | |\ () draft
106 +---o 4:64370c9805e7 added b 104 +---o 4:64370c9805e7 added b
107 | | () draft 105 | | () draft
108 | x 1:c7586e2a9264 added a 106 | x 1:c7586e2a9264 added a
109 |/ () draft 107 |/ () draft
175 173
176 $ hg merge 174 $ hg merge
177 merging c 175 merging c
178 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 176 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
179 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 177 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
180 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon 178 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
181 [1] 179 [1]
182 $ echo foobar > c 180 $ echo foobar > c
183 $ hg resolve -m 181 $ hg resolve -m
184 (no more unresolved files) 182 (no more unresolved files)
185 $ hg ci -m "foobar to c" 183 $ hg ci -m "foobar to c"
198 196
199 $ hg up 1c165c673853 197 $ hg up 1c165c673853
200 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 198 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
201 $ echo FOO > c 199 $ echo FOO > c
202 $ hg amend 200 $ hg amend
203 1 new orphan changesets
204 201
205 $ hg glog 202 $ hg glog
206 @ 11:31c317b7bdb1 foo to c 203 @ 11:31c317b7bdb1 foo to c
207 | () draft 204 | () draft
208 | * 10:fd41d25a3e90 foobar to c 205 | o 10:fd41d25a3e90 foobar to c
209 | |\ () draft 206 | |\ () draft
210 +---o 9:d0f84b25d4e3 bar to c 207 +---o 9:d0f84b25d4e3 bar to c
211 | | () draft 208 | | () draft
212 | x 8:1c165c673853 foo to c 209 | x 8:1c165c673853 foo to c
213 |/ () draft 210 |/ () draft
253 250
254 $ hg up 31c317b7bdb1 251 $ hg up 31c317b7bdb1
255 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 252 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
256 $ echo foo > c 253 $ echo foo > c
257 $ hg amend 254 $ hg amend
258 1 new orphan changesets
259 255
260 $ hg glog 256 $ hg glog
261 @ 13:928097d0b5b5 foo to c 257 @ 13:928097d0b5b5 foo to c
262 | () draft 258 | () draft
263 | * 12:c5405d2da7a1 foobar to c 259 | o 12:c5405d2da7a1 foobar to c
264 | |\ () draft 260 | |\ () draft
265 +---x 11:31c317b7bdb1 foo to c 261 +---x 11:31c317b7bdb1 foo to c
266 | | () draft 262 | | () draft
267 | o 9:d0f84b25d4e3 bar to c 263 | o 9:d0f84b25d4e3 bar to c
268 |/ () draft 264 |/ () draft
327 323
328 $ hg up 8634bee7bf1e 324 $ hg up 8634bee7bf1e
329 0 files updated, 0 files merged, 3 files removed, 0 files unresolved 325 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
330 $ echo bar > l 326 $ echo bar > l
331 $ hg amend 327 $ hg amend
332 2 new orphan changesets
333 328
334 $ hg glog 329 $ hg glog
335 @ 20:fccc9de66799 added l 330 @ 20:fccc9de66799 added l
336 | () draft 331 | () draft
337 | * 19:190763373d8b merge commit 332 | o 19:190763373d8b merge commit
338 | |\ () draft 333 | |\ () draft
339 | | o 18:863d11043c67 added y 334 | | o 18:863d11043c67 added y
340 | | | () draft 335 | | | () draft
341 +---o 17:3f2247835c1d added x 336 +---o 17:3f2247835c1d added x
342 | | () draft 337 | | () draft
343 | * 16:e44dc179e7f5 added m 338 | o 16:e44dc179e7f5 added m
344 | | () draft 339 | | () draft
345 | x 15:8634bee7bf1e added l 340 | x 15:8634bee7bf1e added l
346 |/ () draft 341 |/ () draft
347 o 0:8fa14d15e168 added hgignore 342 o 0:8fa14d15e168 added hgignore
348 () draft 343 () draft
389 384
390 $ hg up fccc9de66799 385 $ hg up fccc9de66799
391 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 386 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
392 $ echo foobar > l 387 $ echo foobar > l
393 $ hg amend 388 $ hg amend
394 1 new orphan changesets
395 $ hg up 3f2247835c1d 389 $ hg up 3f2247835c1d
396 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 390 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
397 $ echo bar > x 391 $ echo bar > x
398 $ hg amend 392 $ hg amend
399 $ hg glog 393 $ hg glog
400 @ 25:cdf6547da25f added x 394 @ 25:cdf6547da25f added x
401 | () draft 395 | () draft
402 | o 24:3f371171d767 added l 396 | o 24:3f371171d767 added l
403 |/ () draft 397 |/ () draft
404 | * 23:7b78a9784f3e merged l and x 398 | o 23:7b78a9784f3e merged l and x
405 | |\ () draft 399 | |\ () draft
406 +---x 20:fccc9de66799 added l 400 +---x 20:fccc9de66799 added l
407 | | () draft 401 | | () draft
408 | x 17:3f2247835c1d added x 402 | x 17:3f2247835c1d added x
409 |/ () draft 403 |/ () draft
457 5) When one of the merge parent is pruned without a successor 451 5) When one of the merge parent is pruned without a successor
458 ------------------------------------------------------------- 452 -------------------------------------------------------------
459 453
460 $ hg prune -r cdf6547da25f 454 $ hg prune -r cdf6547da25f
461 1 changesets pruned 455 1 changesets pruned
462 1 new orphan changesets
463 $ hg glog 456 $ hg glog
464 @ 27:adb665a78e08 merged l and x 457 @ 27:adb665a78e08 merged l and x
465 |\ () draft 458 |\ () draft
466 | x 25:cdf6547da25f added x 459 | x 25:cdf6547da25f added x
467 | | () draft 460 | | () draft
495 o 0:8fa14d15e168 added hgignore 488 o 0:8fa14d15e168 added hgignore
496 () draft 489 () draft
497 490
498 $ hg prune -r 3f371171d767 491 $ hg prune -r 3f371171d767
499 1 changesets pruned 492 1 changesets pruned
500 1 new orphan changesets
501 493
502 $ hg glog 494 $ hg glog
503 @ 28:fb8fe870ae7d merged l and x 495 @ 28:fb8fe870ae7d merged l and x
504 |\ () draft 496 |\ () draft
505 | x 24:3f371171d767 added l 497 | x 24:3f371171d767 added l
565 o 0:8fa14d15e168 added hgignore 557 o 0:8fa14d15e168 added hgignore
566 () draft 558 () draft
567 559
568 $ hg prune -r f3ba8b99bb6f 560 $ hg prune -r f3ba8b99bb6f
569 1 changesets pruned 561 1 changesets pruned
570 1 new orphan changesets
571 562
572 $ hg glog 563 $ hg glog
573 @ 31:32beb84b9dbc merge commit 564 @ 31:32beb84b9dbc merge commit
574 |\ () draft 565 |\ () draft
575 | x 30:f3ba8b99bb6f added foo 566 | x 30:f3ba8b99bb6f added foo