equal
deleted
inserted
replaced
448 ------------------------------------ |
448 ------------------------------------ |
449 |
449 |
450 $ hg rebase --dest 4 --rev '7+11+9' |
450 $ hg rebase --dest 4 --rev '7+11+9' |
451 rebasing 9:cf44d2f5a9f4 "D" |
451 rebasing 9:cf44d2f5a9f4 "D" |
452 rebasing 7:02de42196ebe "H" |
452 rebasing 7:02de42196ebe "H" |
453 not rebasing ignored 10:7c6027df6a99 "B" |
|
454 rebasing 11:0d8f238b634c "C" (tip) |
453 rebasing 11:0d8f238b634c "C" (tip) |
455 $ hg log -G |
454 $ hg log -G |
456 o 14:1e8370e38cca C |
455 o 14:1e8370e38cca C |
457 | |
456 | |
458 @ 13:bfe264faf697 H |
457 @ 13:bfe264faf697 H |
489 > EOF |
488 > EOF |
490 |
489 |
491 $ hg rebase -d G -r 'B + D + F' |
490 $ hg rebase -d G -r 'B + D + F' |
492 rebasing 1:112478962961 "B" (B) |
491 rebasing 1:112478962961 "B" (B) |
493 rebasing 2:b18e25de2cf5 "D" (D) |
492 rebasing 2:b18e25de2cf5 "D" (D) |
494 not rebasing ignored 4:26805aba1e60 "C" (C) |
|
495 not rebasing ignored 5:4b61ff5c62e2 "E" (E) |
|
496 rebasing 6:f15c3adaf214 "F" (F tip) |
493 rebasing 6:f15c3adaf214 "F" (F tip) |
497 abort: cannot rebase 6:f15c3adaf214 without moving at least one of its parents |
494 abort: cannot rebase 6:f15c3adaf214 without moving at least one of its parents |
498 [255] |
495 [255] |
499 |
496 |
500 $ cd .. |
497 $ cd .. |
544 (actual test) |
541 (actual test) |
545 |
542 |
546 $ hg rebase --dest 6 --rev '((desc(H) + desc(D))::) - desc(M)' |
543 $ hg rebase --dest 6 --rev '((desc(H) + desc(D))::) - desc(M)' |
547 rebasing 3:32af7686d403 "D" |
544 rebasing 3:32af7686d403 "D" |
548 rebasing 7:02de42196ebe "H" |
545 rebasing 7:02de42196ebe "H" |
549 not rebasing ignored 8:53a6a128b2b7 "M" |
|
550 rebasing 9:4bde274eefcf "I" (tip) |
546 rebasing 9:4bde274eefcf "I" (tip) |
551 $ hg log -G |
547 $ hg log -G |
552 @ 12:acd174b7ab39 I |
548 @ 12:acd174b7ab39 I |
553 | |
549 | |
554 o 11:6c11a6218c97 H |
550 o 11:6c11a6218c97 H |