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
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
|
# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification,
# in any medium, are permitted without royalty provided the copyright
# notice and this notice are preserved.
# Test the --reject-format=FORMAT option
. $srcdir/test-lib.sh
require_cat
require_sed
require_gnu_diff
use_local_patch
use_tmpdir
# ==============================================================
cat > f.orig <<EOF
a() {
2
3
5
6
}
EOF
sed -e 's/5/5a/' f.orig > f
diff -p -c -L f.orig -L f f.orig f > f.diff
check 'patch -f -F0 --no-backup-if-mismatch f < f.diff || echo "Status: $?"' <<EOF
patching file f
Hunk #1 FAILED at 2.
1 out of 1 hunk FAILED -- saving rejects to file f.rej
Status: 1
EOF
preserve_trailing_blank=
check 'cat f.rej' <<EOF
*** f.orig
--- f
*************** a() {
*** 2,7 ****
2
3
$preserve_trailing_blank
! 5
6
}
--- 2,7 ----
2
3
$preserve_trailing_blank
! 5a
6
}
EOF
# --------------------------------------------------------------
( echo "Index: f"; diff -p -u -L f.orig -L f f.orig f ) > f.diff
check 'patch -f -F0 --no-backup-if-mismatch f < f.diff || echo "Status: $?"' <<EOF
patching file f
Hunk #1 FAILED at 2.
1 out of 1 hunk FAILED -- saving rejects to file f.rej
Status: 1
EOF
check 'cat f.rej' <<EOF
Index: f
--- f.orig
+++ f
@@ -2,6 +2,6 @@
2
3
$preserve_trailing_blank
-5
+5a
6
}
EOF
# --------------------------------------------------------------
diff -p -c -L f.orig -L f f.orig f > f.diff
check 'patch -f -F0 --no-backup-if-mismatch --reject-format=unified f < f.diff || echo "Status: $?"' <<EOF
patching file f
Hunk #1 FAILED at 2.
1 out of 1 hunk FAILED -- saving rejects to file f.rej
Status: 1
EOF
check 'cat f.rej' <<EOF
--- f.orig
+++ f
@@ -2,6 +2,6 @@
2
3
$preserve_trailing_blank
-5
+5a
6
}
EOF
# --------------------------------------------------------------
( echo "Index: f"; diff -p -u -L f.orig -L f f.orig f ) > f.diff
check 'patch -f -F0 --no-backup-if-mismatch --reject-format=context f < f.diff || echo "Status: $?"' <<EOF
patching file f
Hunk #1 FAILED at 2.
1 out of 1 hunk FAILED -- saving rejects to file f.rej
Status: 1
EOF
check 'cat f.rej' <<EOF
Index: f
*** f.orig
--- f
*************** a() {
*** 2,7 ****
2
3
$preserve_trailing_blank
! 5
6
}
--- 2,7 ----
2
3
$preserve_trailing_blank
! 5a
6
}
EOF
# ==============================================================
echo one > a
echo two > b
diff -u -L "a label of a" -L "b label of b" a b > ab.diff
mv b a
check 'patch -f < ab.diff || echo "Status: $?"' <<EOF
patching file a
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file a.rej
Status: 1
EOF
check 'cat a.rej' <<EOF
--- a label of a
+++ b label of b
@@ -1 +1 @@
-one
+two
EOF
|
