equal
deleted
inserted
replaced
21 |
21 |
22 $ hg debugbruterebase 'all()-Z' Z |
22 $ hg debugbruterebase 'all()-Z' Z |
23 A: A':Z |
23 A: A':Z |
24 B: B':Z |
24 B: B':Z |
25 AB: A':Z B':Z |
25 AB: A':Z B':Z |
26 C: ABORT: cannot use revision 3 as base, result would have 3 parents |
26 C: ABORT: cannot rebase 3:a35c07e8a2a4 without moving at least one of its parents |
27 AC: A':Z C':A'B |
27 AC: A':Z C':A'B |
28 BC: B':Z C':B'A |
28 BC: B':Z C':B'A |
29 ABC: A':Z B':Z C':A'B' |
29 ABC: A':Z B':Z C':A'B' |
30 D: D':Z |
30 D: D':Z |
31 AD: A':Z D':Z |
31 AD: A':Z D':Z |
32 BD: B':Z D':B' |
32 BD: B':Z D':B' |
33 ABD: A':Z B':Z D':B' |
33 ABD: A':Z B':Z D':B' |
34 CD: ABORT: cannot use revision 3 as base, result would have 3 parents |
34 CD: ABORT: cannot rebase 3:a35c07e8a2a4 without moving at least one of its parents |
35 ACD: A':Z C':A'B D':Z |
35 ACD: A':Z C':A'B D':Z |
36 BCD: B':Z C':B'A D':B' |
36 BCD: B':Z C':B'A D':B' |
37 ABCD: A':Z B':Z C':A'B' D':B' |
37 ABCD: A':Z B':Z C':A'B' D':B' |
38 |
38 |
39 Moving backwards |
39 Moving backwards |
47 > EOS |
47 > EOS |
48 $ hg debugbruterebase 'all()-Z' Z |
48 $ hg debugbruterebase 'all()-Z' Z |
49 B: B':Z |
49 B: B':Z |
50 A: |
50 A: |
51 BA: B':Z |
51 BA: B':Z |
52 C: ABORT: cannot use revision 3 as base, result would have 3 parents |
52 C: ABORT: cannot rebase 3:b8d7149b562b without moving at least one of its parents |
53 BC: B':Z C':B'A |
53 BC: B':Z C':B'A |
54 AC: |
54 AC: |
55 BAC: B':Z C':B'A |
55 BAC: B':Z C':B'A |