blob: 52d3004185a6fe9dcf45074d54c2d35403e3efc4 (
plain)
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
|
# Copyright (C) 2010-2012 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.
. $srcdir/test-lib.sh
require_cat
use_local_patch
use_tmpdir
# ==============================================================
cat > concatenated.diff <<EOF
diff --git a/f b/f
new file mode 100644
index 0000000..5626abf
--- /dev/null
+++ b/f
@@ -0,0 +1 @@
+one
diff --git a/f b/f
index 5626abf..f719efd 100644
--- a/f
+++ b/f
@@ -1 +1 @@
-one
+two
diff --git a/f b/f
index f719efd..2bdf67a 100644
--- a/f
+++ b/f
@@ -1 +1 @@
-two
+three
EOF
check 'patch -p1 < concatenated.diff || echo "Status: $?"' <<EOF
patching file f
patching file f
patching file f
EOF
check 'cat f' <<EOF
three
EOF
cat > f <<EOF
1
2
3
EOF
cat > concat2.diff <<EOF
diff --git a/f b/f
index 01e79c3..0d0b976 100644
--- a/f
+++ b/f
@@ -1,3 +1,4 @@
1
2
3
+b
diff --git a/f b/f
index 0d0b976..6b2348d 100644
--- a/f
+++ b/f
@@ -1,3 +1,4 @@
+a
1
2
3
EOF
check 'patch -p1 < concat2.diff || echo "Status: $?"' <<EOF
patching file f
patching file f
EOF
check 'cat f' <<EOF
a
1
2
3
b
EOF
|
