--- a/tests/test-rebase-partial.t Sun Dec 10 22:39:46 2017 -0800
+++ b/tests/test-rebase-partial.t Sun Dec 10 21:57:37 2017 -0800
@@ -11,7 +11,7 @@
> evolution.allowunstable=True
>
> [alias]
- > tglog = log -G --template "{rev}: {desc}"
+ > tglog = log -G --template "{rev}: {node|short} {desc}"
> EOF
$ rebasewithdag() {
@@ -37,15 +37,15 @@
> EOF
rebasing 2:b18e25de2cf5 "D" (D)
already rebased 3:26805aba1e60 "C" (C tip)
- o 4: D
+ o 4: fe3b4c6498fa D
|
- | o 3: C
+ | o 3: 26805aba1e60 C
|/
- | x 2: D
+ | x 2: b18e25de2cf5 D
| |
- o | 1: B
+ o | 1: 112478962961 B
|/
- o 0: A
+ o 0: 426bada5c675 A
Can collapse commits even if one is already in the right place
@@ -58,16 +58,16 @@
> EOF
rebasing 2:b18e25de2cf5 "D" (D)
rebasing 3:26805aba1e60 "C" (C tip)
- o 4: Collapsed revision
+ o 4: a2493f4ace65 Collapsed revision
| * D
| * C
- | x 3: C
+ | x 3: 26805aba1e60 C
|/
- | x 2: D
+ | x 2: b18e25de2cf5 D
| |
- o | 1: B
+ o | 1: 112478962961 B
|/
- o 0: A
+ o 0: 426bada5c675 A
Rebase with "holes". The commits after the hole should end up on the parent of
the hole (B below), not on top of the destination (A).
@@ -83,13 +83,13 @@
> EOF
already rebased 1:112478962961 "B" (B)
rebasing 3:f585351a92f8 "D" (D tip)
- o 4: D
+ o 4: 1e6da8103bc7 D
|
- | x 3: D
+ | x 3: f585351a92f8 D
| |
- | o 2: C
+ | o 2: 26805aba1e60 C
|/
- o 1: B
+ o 1: 112478962961 B
|
- o 0: A
+ o 0: 426bada5c675 A