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
73
74
75
76
77
78
|
#!/bin/sh
# This is a rediff(1) testcase.
# Test: Pass through extra stuff.
set -x
. ${top_srcdir-.}/tests/common.sh
cat << EOF > original-patch
This is the patch I want to apply:
--- file.orig
+++ file
@@ -6,7 +6,7
blah
blah
blah
-not
+important
blah
blah
blah
Oh, and this one:
--- unchanged.orig
+++ unchanged
@@ -37,6 +37,7 @@
blah
blah
blah
+blah
blah
blah
blah
Okay?
Hope so.
EOF
sed -e 's/-not$/+very/' original-patch > edited-patch
${REDIFF} original-patch edited-patch 2>errors >rediffed-patch || exit 1
ERRORS=`cat errors`
[ -z "${ERRORS}" ] || exit 1
cat << EOF | cmp - rediffed-patch || exit 1
This is the patch I want to apply:
--- file.orig
+++ file
@@ -6,6 +6,8 @@
blah
blah
blah
+very
+important
blah
blah
blah
Oh, and this one:
--- unchanged.orig
+++ unchanged
@@ -37,6 +37,7 @@
blah
blah
blah
+blah
blah
blah
blah
Okay?
Hope so.
EOF
|
