1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
#!/bin/sh
# This is a rediff(1) testcase.
# Test: Add a hunk at the end of a patch but before another.
. ${top_srcdir-.}/tests/common.sh
cat << EOF > original-patch
--- file.orig
+++ file
@@ -6,7 +6,7 @@
blah
blah
blah
-not
+important
blah
blah
blah
--- otherfile.orig
+++ otherfile
@@ -1 +1 @@
-a
+A
EOF
cat << EOF > edited-patch
--- file.orig
+++ file
@@ -6,7 +6,7 @@
blah
blah
blah
-not
+important
blah
blah
blah
@@ -36 +36 @@
-old
+new
--- otherfile.orig
+++ otherfile
@@ -1 +1 @@
-a
+A
EOF
${REDIFF} original-patch edited-patch 2>errors >rediffed-patch || exit 1
[ -s errors ] && exit 1
cat << EOF | cmp - rediffed-patch || exit 1
--- file.orig
+++ file
@@ -6,7 +6,7 @@
blah
blah
blah
-not
+important
blah
blah
blah
@@ -36 +36 @@
-old
+new
--- otherfile.orig
+++ otherfile
@@ -1 +1 @@
-a
+A
EOF
|
