Show More
@@ -1,58 +1,58 | |||||
1 | #!/bin/sh |
|
1 | #!/bin/sh | |
2 |
|
2 | |||
3 | hg init repo |
|
3 | hg init repo | |
4 | cd repo |
|
4 | cd repo | |
5 | cat > a <<EOF |
|
5 | cat > a <<EOF | |
6 | c |
|
6 | c | |
7 | c |
|
7 | c | |
8 | a |
|
8 | a | |
9 | a |
|
9 | a | |
10 | b |
|
10 | b | |
11 | a |
|
11 | a | |
12 | a |
|
12 | a | |
13 | c |
|
13 | c | |
14 | c |
|
14 | c | |
15 | EOF |
|
15 | EOF | |
16 | hg ci -Am adda |
|
16 | hg ci -Am adda | |
17 | cat > a <<EOF |
|
17 | cat > a <<EOF | |
18 | c |
|
18 | c | |
19 | c |
|
19 | c | |
20 | a |
|
20 | a | |
21 | a |
|
21 | a | |
22 | dd |
|
22 | dd | |
23 | a |
|
23 | a | |
24 | a |
|
24 | a | |
25 | c |
|
25 | c | |
26 | c |
|
26 | c | |
27 | EOF |
|
27 | EOF | |
28 |
|
28 | |||
29 | echo '% default context' |
|
29 | echo '% default context' | |
30 | hg diff --nodates |
|
30 | hg diff --nodates | |
31 |
|
31 | |||
32 | echo '% invalid --unified' |
|
32 | echo '% invalid --unified' | |
33 | hg diff --nodates -U foo |
|
33 | hg diff --nodates -U foo | |
34 |
|
34 | |||
35 | echo '% --unified=2' |
|
35 | echo '% --unified=2' | |
36 | hg diff --nodates -U 2 |
|
36 | hg diff --nodates -U 2 | |
37 |
|
37 | |||
38 | echo '% diff.unified=2' |
|
38 | echo '% diff.unified=2' | |
39 | hg --config diff.unified=2 diff --nodates |
|
39 | hg --config diff.unified=2 diff --nodates | |
40 |
|
40 | |||
41 | echo '% diff.unified=2 --unified=1' |
|
41 | echo '% diff.unified=2 --unified=1' | |
42 | hg diff --nodates -U 1 |
|
42 | hg diff --nodates -U 1 | |
43 |
|
43 | |||
44 | echo '% invalid diff.unified' |
|
44 | echo '% invalid diff.unified' | |
45 | hg --config diff.unified=foo diff --nodates |
|
45 | hg --config diff.unified=foo diff --nodates | |
46 |
|
46 | |||
47 | echo % test off-by-one error with diff -p |
|
47 | echo % test off-by-one error with diff -p | |
48 | hg init diffp |
|
48 | hg init diffp | |
49 | cd diffp |
|
49 | cd diffp | |
50 | echo a > a |
|
50 | echo a > a | |
51 | hg ci -Ama |
|
51 | hg ci -Ama | |
52 | rm a |
|
52 | rm a | |
53 | echo b > a |
|
53 | echo b > a | |
54 | echo a >> a |
|
54 | echo a >> a | |
55 | echo c >> a |
|
55 | echo c >> a | |
56 | hg diff -U0 -p |
|
56 | hg diff -U0 -p --nodates | |
57 |
|
57 | |||
58 | exit 0 |
|
58 | exit 0 |
@@ -1,58 +1,58 | |||||
1 | adding a |
|
1 | adding a | |
2 | % default context |
|
2 | % default context | |
3 | diff -r cf9f4ba66af2 a |
|
3 | diff -r cf9f4ba66af2 a | |
4 | --- a/a |
|
4 | --- a/a | |
5 | +++ b/a |
|
5 | +++ b/a | |
6 | @@ -2,7 +2,7 @@ |
|
6 | @@ -2,7 +2,7 @@ | |
7 | c |
|
7 | c | |
8 | a |
|
8 | a | |
9 | a |
|
9 | a | |
10 | -b |
|
10 | -b | |
11 | +dd |
|
11 | +dd | |
12 | a |
|
12 | a | |
13 | a |
|
13 | a | |
14 | c |
|
14 | c | |
15 | % invalid --unified |
|
15 | % invalid --unified | |
16 | abort: diff context lines count must be an integer, not 'foo' |
|
16 | abort: diff context lines count must be an integer, not 'foo' | |
17 | % --unified=2 |
|
17 | % --unified=2 | |
18 | diff -r cf9f4ba66af2 a |
|
18 | diff -r cf9f4ba66af2 a | |
19 | --- a/a |
|
19 | --- a/a | |
20 | +++ b/a |
|
20 | +++ b/a | |
21 | @@ -3,5 +3,5 @@ |
|
21 | @@ -3,5 +3,5 @@ | |
22 | a |
|
22 | a | |
23 | a |
|
23 | a | |
24 | -b |
|
24 | -b | |
25 | +dd |
|
25 | +dd | |
26 | a |
|
26 | a | |
27 | a |
|
27 | a | |
28 | % diff.unified=2 |
|
28 | % diff.unified=2 | |
29 | diff -r cf9f4ba66af2 a |
|
29 | diff -r cf9f4ba66af2 a | |
30 | --- a/a |
|
30 | --- a/a | |
31 | +++ b/a |
|
31 | +++ b/a | |
32 | @@ -3,5 +3,5 @@ |
|
32 | @@ -3,5 +3,5 @@ | |
33 | a |
|
33 | a | |
34 | a |
|
34 | a | |
35 | -b |
|
35 | -b | |
36 | +dd |
|
36 | +dd | |
37 | a |
|
37 | a | |
38 | a |
|
38 | a | |
39 | % diff.unified=2 --unified=1 |
|
39 | % diff.unified=2 --unified=1 | |
40 | diff -r cf9f4ba66af2 a |
|
40 | diff -r cf9f4ba66af2 a | |
41 | --- a/a |
|
41 | --- a/a | |
42 | +++ b/a |
|
42 | +++ b/a | |
43 | @@ -4,3 +4,3 @@ |
|
43 | @@ -4,3 +4,3 @@ | |
44 | a |
|
44 | a | |
45 | -b |
|
45 | -b | |
46 | +dd |
|
46 | +dd | |
47 | a |
|
47 | a | |
48 | % invalid diff.unified |
|
48 | % invalid diff.unified | |
49 | abort: diff context lines count must be an integer, not 'foo' |
|
49 | abort: diff context lines count must be an integer, not 'foo' | |
50 | % test off-by-one error with diff -p |
|
50 | % test off-by-one error with diff -p | |
51 | adding a |
|
51 | adding a | |
52 | diff -r cb9a9f314b8b a |
|
52 | diff -r cb9a9f314b8b a | |
53 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
53 | --- a/a | |
54 | +++ b/a Thu Nov 27 17:46:15 2008 +0000 |
|
54 | +++ b/a | |
55 | @@ -1,0 +1,1 @@ |
|
55 | @@ -1,0 +1,1 @@ | |
56 | +b |
|
56 | +b | |
57 | @@ -2,0 +3,1 @@ a |
|
57 | @@ -2,0 +3,1 @@ a | |
58 | +c |
|
58 | +c |
General Comments 0
You need to be logged in to leave comments.
Login now