##// END OF EJS Templates
test-rebase: add another test for rebase with multiple roots...
Pierre-Yves David -
r18472:37100f30 stable
parent child Browse files
Show More
@@ -385,3 +385,74 b' Test multiple root handling'
385 385 o 0:cd010b8cd998 A
386 386
387 387 $ cd ..
388
389 test on rebase dropping a merge
390
391 (setup)
392
393 $ hg init dropmerge
394 $ cd dropmerge
395 $ hg unbundle "$TESTDIR/bundles/rebase.hg"
396 adding changesets
397 adding manifests
398 adding file changes
399 added 8 changesets with 7 changes to 7 files (+2 heads)
400 (run 'hg heads' to see heads, 'hg merge' to merge)
401 $ hg up 3
402 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
403 $ hg merge 7
404 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
405 (branch merge, don't forget to commit)
406 $ hg ci -m 'M'
407 $ echo I > I
408 $ hg add I
409 $ hg ci -m I
410 $ hg log -G
411 @ 9:4bde274eefcf I
412 |
413 o 8:53a6a128b2b7 M
414 |\
415 | o 7:02de42196ebe H
416 | |
417 | | o 6:eea13746799a G
418 | |/|
419 | o | 5:24b6387c8c8c F
420 | | |
421 | | o 4:9520eea781bc E
422 | |/
423 o | 3:32af7686d403 D
424 | |
425 o | 2:5fddd98957c8 C
426 | |
427 o | 1:42ccdea3bb16 B
428 |/
429 o 0:cd010b8cd998 A
430
431 (actual test)
432
433 $ hg rebase --dest 6 --rev '((desc(H) + desc(D))::) - desc(M)'
434 $ hg log -G
435 @ 12:acd174b7ab39 I
436 |
437 o 11:6c11a6218c97 H
438 |
439 | o 10:b5313c85b22e D
440 |/
441 | o 8:53a6a128b2b7 M
442 | |\
443 | | x 7:02de42196ebe H
444 | | |
445 o---+ 6:eea13746799a G
446 | | |
447 | | o 5:24b6387c8c8c F
448 | | |
449 o---+ 4:9520eea781bc E
450 / /
451 x | 3:32af7686d403 D
452 | |
453 o | 2:5fddd98957c8 C
454 | |
455 o | 1:42ccdea3bb16 B
456 |/
457 o 0:cd010b8cd998 A
458
General Comments 0
You need to be logged in to leave comments. Login now