aboutsummaryrefslogtreecommitdiffstats
path: root/patch-test/21
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2016-03-23 13:27:51 +0100
committerMattias Andrée <maandree@member.fsf.org>2016-03-23 13:29:26 +0100
commitcaa881729a9d394fec28b952fc111c6008613e55 (patch)
tree56e143e393f230d37ad08a0a13123e20d3f0cfe6 /patch-test/21
downloadbase-util-tests-caa881729a9d394fec28b952fc111c6008613e55.tar.gz
base-util-tests-caa881729a9d394fec28b952fc111c6008613e55.tar.bz2
base-util-tests-caa881729a9d394fec28b952fc111c6008613e55.tar.xz
initial import
Signed-off-by: Mattias Andrée <maandree@member.fsf.org>
Diffstat (limited to 'patch-test/21')
-rw-r--r--patch-test/21/def48
-rw-r--r--patch-test/21/new37
-rw-r--r--patch-test/21/old34
-rw-r--r--patch-test/21/patch10
-rw-r--r--patch-test/21/patch-c46
-rw-r--r--patch-test/21/patch-c022
-rw-r--r--patch-test/21/patch-c130
-rw-r--r--patch-test/21/patch-e13
-rw-r--r--patch-test/21/patch-u36
-rw-r--r--patch-test/21/patch-u012
-rw-r--r--patch-test/21/patch-u120
11 files changed, 308 insertions, 0 deletions
diff --git a/patch-test/21/def b/patch-test/21/def
new file mode 100644
index 0000000..76ed4ab
--- /dev/null
+++ b/patch-test/21/def
@@ -0,0 +1,48 @@
+#ifdef x
+b
+#endif
+a
+a
+a
+a
+a
+a
+a
+a
+#ifdef x
+b
+#endif
+a
+a
+a
+a
+a
+a
+a
+#ifndef x
+c
+#endif
+a
+a
+a
+a
+a
+a
+a
+#ifdef x
+b
+#endif
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+#ifdef x
+b
+#endif
diff --git a/patch-test/21/new b/patch-test/21/new
new file mode 100644
index 0000000..9dc0f5b
--- /dev/null
+++ b/patch-test/21/new
@@ -0,0 +1,37 @@
+b
+a
+a
+a
+a
+a
+a
+a
+a
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
diff --git a/patch-test/21/old b/patch-test/21/old
new file mode 100644
index 0000000..6109918
--- /dev/null
+++ b/patch-test/21/old
@@ -0,0 +1,34 @@
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
diff --git a/patch-test/21/patch b/patch-test/21/patch
new file mode 100644
index 0000000..9a8d9bf
--- /dev/null
+++ b/patch-test/21/patch
@@ -0,0 +1,10 @@
+0a1
+> b
+8a10
+> b
+16d17
+< c
+23a25
+> b
+34a37
+> b
diff --git a/patch-test/21/patch-c b/patch-test/21/patch-c
new file mode 100644
index 0000000..47f20e4
--- /dev/null
+++ b/patch-test/21/patch-c
@@ -0,0 +1,46 @@
+*** old 2016-03-18 11:25:10.615650099 +0100
+--- new 2016-03-18 11:25:10.335650001 +0100
+***************
+*** 1,3 ****
+--- 1,4 ----
++ b
+ a
+ a
+ a
+***************
+*** 6,11 ****
+--- 7,13 ----
+ a
+ a
+ a
++ b
+ a
+ a
+ a
+***************
+*** 13,19 ****
+ a
+ a
+ a
+- c
+ a
+ a
+ a
+--- 15,20 ----
+***************
+*** 21,26 ****
+--- 22,28 ----
+ a
+ a
+ a
++ b
+ a
+ a
+ a
+***************
+*** 32,34 ****
+--- 34,37 ----
+ a
+ a
+ a
++ b
diff --git a/patch-test/21/patch-c0 b/patch-test/21/patch-c0
new file mode 100644
index 0000000..4082af6
--- /dev/null
+++ b/patch-test/21/patch-c0
@@ -0,0 +1,22 @@
+*** old 2016-03-18 11:25:10.615650099 +0100
+--- new 2016-03-18 11:25:10.335650001 +0100
+***************
+*** 0 ****
+--- 1 ----
++ b
+***************
+*** 8 ****
+--- 10 ----
++ b
+***************
+*** 16 ****
+- c
+--- 17 ----
+***************
+*** 23 ****
+--- 25 ----
++ b
+***************
+*** 34 ****
+--- 37 ----
++ b
diff --git a/patch-test/21/patch-c1 b/patch-test/21/patch-c1
new file mode 100644
index 0000000..bf7cec5
--- /dev/null
+++ b/patch-test/21/patch-c1
@@ -0,0 +1,30 @@
+*** old 2016-03-18 11:25:10.615650099 +0100
+--- new 2016-03-18 11:25:10.335650001 +0100
+***************
+*** 1 ****
+--- 1,2 ----
++ b
+ a
+***************
+*** 8,9 ****
+--- 9,11 ----
+ a
++ b
+ a
+***************
+*** 15,17 ****
+ a
+- c
+ a
+--- 17,18 ----
+***************
+*** 23,24 ****
+--- 24,26 ----
+ a
++ b
+ a
+***************
+*** 34 ****
+--- 36,37 ----
+ a
++ b
diff --git a/patch-test/21/patch-e b/patch-test/21/patch-e
new file mode 100644
index 0000000..f523a87
--- /dev/null
+++ b/patch-test/21/patch-e
@@ -0,0 +1,13 @@
+34a
+b
+.
+23a
+b
+.
+16d
+8a
+b
+.
+0a
+b
+.
diff --git a/patch-test/21/patch-u b/patch-test/21/patch-u
new file mode 100644
index 0000000..031231d
--- /dev/null
+++ b/patch-test/21/patch-u
@@ -0,0 +1,36 @@
+--- old 2016-03-18 11:25:10.615650099 +0100
++++ new 2016-03-18 11:25:10.335650001 +0100
+@@ -1,3 +1,4 @@
++b
+ a
+ a
+ a
+@@ -6,6 +7,7 @@
+ a
+ a
+ a
++b
+ a
+ a
+ a
+@@ -13,7 +15,6 @@
+ a
+ a
+ a
+-c
+ a
+ a
+ a
+@@ -21,6 +22,7 @@
+ a
+ a
+ a
++b
+ a
+ a
+ a
+@@ -32,3 +34,4 @@
+ a
+ a
+ a
++b
diff --git a/patch-test/21/patch-u0 b/patch-test/21/patch-u0
new file mode 100644
index 0000000..a1bdf1a
--- /dev/null
+++ b/patch-test/21/patch-u0
@@ -0,0 +1,12 @@
+--- old 2016-03-18 11:25:10.615650099 +0100
++++ new 2016-03-18 11:25:10.335650001 +0100
+@@ -0,0 +1 @@
++b
+@@ -8,0 +10 @@
++b
+@@ -16 +17,0 @@
+-c
+@@ -23,0 +25 @@
++b
+@@ -34,0 +37 @@
++b
diff --git a/patch-test/21/patch-u1 b/patch-test/21/patch-u1
new file mode 100644
index 0000000..6730858
--- /dev/null
+++ b/patch-test/21/patch-u1
@@ -0,0 +1,20 @@
+--- old 2016-03-18 11:25:10.615650099 +0100
++++ new 2016-03-18 11:25:10.335650001 +0100
+@@ -1 +1,2 @@
++b
+ a
+@@ -8,2 +9,3 @@
+ a
++b
+ a
+@@ -15,3 +17,2 @@
+ a
+-c
+ a
+@@ -23,2 +24,3 @@
+ a
++b
+ a
+@@ -34 +36,2 @@
+ a
++b