Show More
@@ -1,61 +1,61 | |||||
1 | #!/bin/sh |
|
1 | #!/bin/sh | |
2 |
|
2 | |||
3 | cp "$TESTDIR"/../contrib/simplemerge . |
|
3 | cp "$TESTDIR"/../contrib/simplemerge . | |
4 |
|
4 | |||
5 | echo base > base |
|
5 | echo base > base | |
6 |
|
6 | |||
7 | echo local > local |
|
7 | echo local > local | |
8 | cat base >> local |
|
8 | cat base >> local | |
9 | cp local orig |
|
9 | cp local orig | |
10 |
|
10 | |||
11 | cat base > other |
|
11 | cat base > other | |
12 | echo other >> other |
|
12 | echo other >> other | |
13 |
|
13 | |||
14 | echo '% changing local directly' |
|
14 | echo '% changing local directly' | |
15 | python simplemerge local base other && echo "merge succeeded" |
|
15 | python simplemerge local base other && echo "merge succeeded" | |
16 | cat local |
|
16 | cat local | |
17 | cp orig local |
|
17 | cp orig local | |
18 |
|
18 | |||
19 | echo '% printing to stdout' |
|
19 | echo '% printing to stdout' | |
20 | python simplemerge -p local base other |
|
20 | python simplemerge -p local base other | |
21 | echo ' local:' |
|
21 | echo ' local:' | |
22 | cat local |
|
22 | cat local | |
23 |
|
23 | |||
24 | echo '% conflicts' |
|
24 | echo '% conflicts' | |
25 | cp base conflict-local |
|
25 | cp base conflict-local | |
26 | cp other conflict-other |
|
26 | cp other conflict-other | |
27 | echo not other >> conflict-local |
|
27 | echo not other >> conflict-local | |
28 | echo end >> conflict-local |
|
28 | echo end >> conflict-local | |
29 | echo end >> conflict-other |
|
29 | echo end >> conflict-other | |
30 | python simplemerge -p conflict-local base conflict-other || echo "merge failed" |
|
30 | python simplemerge -p conflict-local base conflict-other || echo "merge failed" | |
31 |
|
31 | |||
32 | echo '% --no-minimal' |
|
32 | echo '% --no-minimal' | |
33 | python simplemerge -p --no-minimal conflict-local base conflict-other |
|
33 | python simplemerge -p --no-minimal conflict-local base conflict-other | |
34 |
|
34 | |||
35 | echo '% 1 label' |
|
35 | echo '% 1 label' | |
36 | python simplemerge -p -L foo conflict-local base conflict-other |
|
36 | python simplemerge -p -L foo conflict-local base conflict-other | |
37 |
|
37 | |||
38 | echo '% 2 labels' |
|
38 | echo '% 2 labels' | |
39 | python simplemerge -p -L foo -L bar conflict-local base conflict-other |
|
39 | python simplemerge -p -L foo -L bar conflict-local base conflict-other | |
40 |
|
40 | |||
41 | echo '% too many labels' |
|
41 | echo '% too many labels' | |
42 | python simplemerge -p -L foo -L bar -L baz conflict-local base conflict-other |
|
42 | python simplemerge -p -L foo -L bar -L baz conflict-local base conflict-other | |
43 |
|
43 | |||
44 | echo '% binary file' |
|
44 | echo '% binary file' | |
45 | printf '\x00' > binary-local |
|
45 | python -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()" | |
46 | cat orig >> binary-local |
|
46 | cat orig >> binary-local | |
47 | python simplemerge -p binary-local base other |
|
47 | python simplemerge -p binary-local base other | |
48 |
|
48 | |||
49 | echo '% binary file --text' |
|
49 | echo '% binary file --text' | |
50 | python simplemerge -a -p binary-local base other |
|
50 | python simplemerge -a -p binary-local base other | |
51 |
|
51 | |||
52 | echo '% help' |
|
52 | echo '% help' | |
53 | python simplemerge --help |
|
53 | python simplemerge --help | |
54 |
|
54 | |||
55 | echo '% wrong number of arguments' |
|
55 | echo '% wrong number of arguments' | |
56 | python simplemerge |
|
56 | python simplemerge | |
57 |
|
57 | |||
58 | echo '% bad option' |
|
58 | echo '% bad option' | |
59 | python simplemerge --foo -p local base other |
|
59 | python simplemerge --foo -p local base other | |
60 |
|
60 | |||
61 | exit 0 |
|
61 | exit 0 |
General Comments 0
You need to be logged in to leave comments.
Login now