33708
|
1 |
$ cat >> $HGRCPATH <<EOF
|
|
2 |
> [extensions]
|
|
3 |
> drawdag=$TESTDIR/drawdag.py
|
|
4 |
> bruterebase=$TESTDIR/bruterebase.py
|
|
5 |
> [experimental]
|
|
6 |
> evolution=createmarkers,allowunstable
|
|
7 |
> EOF
|
|
8 |
$ init() {
|
|
9 |
> N=`expr ${N:-0} + 1`
|
|
10 |
> cd $TESTTMP && hg init repo$N && cd repo$N
|
|
11 |
> hg debugdrawdag
|
|
12 |
> }
|
|
13 |
|
|
14 |
Source looks like "N"
|
|
15 |
|
|
16 |
$ init <<'EOS'
|
|
17 |
> C D
|
|
18 |
> |\|
|
|
19 |
> A B Z
|
|
20 |
> EOS
|
|
21 |
|
|
22 |
$ hg debugbruterebase 'all()-Z' Z
|
|
23 |
A: A':Z
|
|
24 |
B: B':Z
|
|
25 |
AB: A':Z B':Z
|
|
26 |
C: ABORT: cannot use revision 3 as base, result would have 3 parents
|
|
27 |
AC: A':Z C':A'B
|
|
28 |
BC: B':Z C':B'A
|
|
29 |
ABC: A':Z B':Z C':A'B'
|
|
30 |
D: D':Z
|
|
31 |
AD: A':Z D':Z
|
|
32 |
BD: B':Z D':B'
|
|
33 |
ABD: A':Z B':Z D':B'
|
|
34 |
CD: CRASH: revlog index out of range
|
|
35 |
ACD: A':Z C':A'A' D':Z
|
|
36 |
BCD: B':Z C':B'A D':B'
|
|
37 |
ABCD: A':Z B':Z C':A'B' D':B'
|
|
38 |
|
|
39 |
Moving backwards
|
|
40 |
|
|
41 |
$ init <<'EOS'
|
|
42 |
> C
|
|
43 |
> |\
|
|
44 |
> A B
|
|
45 |
> |
|
|
46 |
> Z
|
|
47 |
> EOS
|
|
48 |
$ hg debugbruterebase 'all()-Z' Z
|
|
49 |
B: B':Z
|
|
50 |
A:
|
|
51 |
BA: B':Z
|
|
52 |
C: ABORT: cannot use revision 3 as base, result would have 3 parents
|
|
53 |
BC: B':Z C':B'A
|
|
54 |
AC:
|
|
55 |
BAC: ABORT: nothing to merge
|