test-rebase-brute-force.t
55 lines
| 1.0 KiB
| text/troff
|
Tads3Lexer
/ tests / test-rebase-brute-force.t
Jun Wu
|
r33674 | $ cat >> $HGRCPATH <<EOF | ||
> [extensions] | ||||
> drawdag=$TESTDIR/drawdag.py | ||||
> bruterebase=$TESTDIR/bruterebase.py | ||||
> [experimental] | ||||
> evolution=createmarkers,allowunstable | ||||
> EOF | ||||
$ init() { | ||||
> N=`expr ${N:-0} + 1` | ||||
> cd $TESTTMP && hg init repo$N && cd repo$N | ||||
> hg debugdrawdag | ||||
> } | ||||
Source looks like "N" | ||||
$ init <<'EOS' | ||||
> C D | ||||
> |\| | ||||
> A B Z | ||||
> EOS | ||||
$ hg debugbruterebase 'all()-Z' Z | ||||
A: A':Z | ||||
B: B':Z | ||||
AB: A':Z B':Z | ||||
C: ABORT: cannot use revision 3 as base, result would have 3 parents | ||||
AC: A':Z C':A'B | ||||
BC: B':Z C':B'A | ||||
ABC: A':Z B':Z C':A'B' | ||||
D: D':Z | ||||
AD: A':Z D':Z | ||||
BD: B':Z D':B' | ||||
ABD: A':Z B':Z D':B' | ||||
CD: CRASH: revlog index out of range | ||||
ACD: A':Z C':A'A' D':Z | ||||
BCD: B':Z C':B'A D':B' | ||||
ABCD: A':Z B':Z C':A'B' D':B' | ||||
Moving backwards | ||||
$ init <<'EOS' | ||||
> C | ||||
> |\ | ||||
> A B | ||||
> | | ||||
> Z | ||||
> EOS | ||||
$ hg debugbruterebase 'all()-Z' Z | ||||
B: B':Z | ||||
A: | ||||
BA: B':Z | ||||
C: ABORT: cannot use revision 3 as base, result would have 3 parents | ||||
BC: B':Z C':B'A | ||||
AC: | ||||
BAC: ABORT: nothing to merge | ||||