|
921
by Martin Pool
- shell script to set up a weave merge test case |
1 |
#! /bin/zsh -xe
|
2 |
||
3 |
weave init test.weave |
|
4 |
||
5 |
weave add test.weave <<EOF
|
|
6 |
aaa
|
|
7 |
bbb
|
|
8 |
ccc
|
|
9 |
EOF
|
|
10 |
||
11 |
weave add test.weave 0 <<EOF |
|
12 |
aaa
|
|
13 |
bbb
|
|
14 |
stuff from martin
|
|
15 |
ccc
|
|
16 |
ddd
|
|
17 |
EOF
|
|
18 |
||
19 |
weave add test.weave 0 <<EOF |
|
20 |
aaa
|
|
21 |
bbb
|
|
22 |
stuff from john
|
|
23 |
more john stuff
|
|
24 |
ccc
|
|
25 |
EOF
|
|
26 |
||
27 |
weave add test.weave 1 2 <<EOF |
|
28 |
aaa
|
|
29 |
bbb
|
|
30 |
stuff from martin
|
|
31 |
fix up merge
|
|
32 |
more john stuff
|
|
33 |
ccc
|
|
34 |
ddd
|
|
35 |
EOF
|
|
36 |
||
37 |
weave add test.weave 3 <<EOF |
|
38 |
aaa
|
|
39 |
bbb
|
|
40 |
stuff from martin
|
|
41 |
fix up merge
|
|
42 |
modify john's code
|
|
43 |
ccc
|
|
44 |
ddd
|
|
45 |
add stuff here
|
|
46 |
EOF
|
|
47 |
||
48 |
# v5
|
|
49 |
weave add test.weave 2 <<EOF |
|
50 |
aaa
|
|
51 |
bbb
|
|
52 |
stuff from john
|
|
53 |
more john stuff
|
|
54 |
john replaced ccc line
|
|
55 |
EOF
|
|
56 |
||
57 |
# now try merging 5(2) with 4(3(2 1))
|