aboutsummaryrefslogtreecommitdiffstats
path: root/patch-test/reppatch_def
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--patch-test/reppatch_def/def53
-rw-r--r--patch-test/reppatch_def/def.alt157
-rw-r--r--patch-test/reppatch_def/def.alt257
-rw-r--r--patch-test/reppatch_def/inter35
-rw-r--r--patch-test/reppatch_def/new29
-rw-r--r--patch-test/reppatch_def/old41
-rw-r--r--patch-test/reppatch_def/patch32
-rw-r--r--patch-test/reppatch_def/patch-c97
-rw-r--r--patch-test/reppatch_def/patch-c057
-rw-r--r--patch-test/reppatch_def/patch-c175
-rw-r--r--patch-test/reppatch_def/patch-e20
-rw-r--r--patch-test/reppatch_def/patch-u69
-rw-r--r--patch-test/reppatch_def/patch-u035
-rw-r--r--patch-test/reppatch_def/patch-u151
14 files changed, 708 insertions, 0 deletions
diff --git a/patch-test/reppatch_def/def b/patch-test/reppatch_def/def
new file mode 100644
index 0000000..9fabe57
--- /dev/null
+++ b/patch-test/reppatch_def/def
@@ -0,0 +1,53 @@
+0
+1
+2
+3
+#ifdef x
+added
+added
+#endif
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+#ifndef x
+16
+#endif
+17
+18
+#ifndef x
+19
+20
+#endif
+21
+22
+#ifndef x
+23
+24
+25
+#endif
+26
+27
+28
+29
+30
+31
+32
+#ifndef x
+33
+34
+35
+36
+37
+38
+39
+40
+#endif
diff --git a/patch-test/reppatch_def/def.alt1 b/patch-test/reppatch_def/def.alt1
new file mode 100644
index 0000000..cc0d82e
--- /dev/null
+++ b/patch-test/reppatch_def/def.alt1
@@ -0,0 +1,57 @@
+#ifndef x
+0
+#else
+0
+#endif
+1
+2
+3
+#ifdef x
+added
+added
+#endif
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+#ifndef x
+16
+#endif
+17
+18
+#ifndef x
+19
+20
+#endif
+21
+22
+#ifndef x
+23
+24
+25
+#endif
+26
+27
+28
+29
+30
+31
+32
+#ifndef x
+33
+34
+35
+36
+37
+38
+39
+40
+#endif
diff --git a/patch-test/reppatch_def/def.alt2 b/patch-test/reppatch_def/def.alt2
new file mode 100644
index 0000000..6c3f6db
--- /dev/null
+++ b/patch-test/reppatch_def/def.alt2
@@ -0,0 +1,57 @@
+#ifdef x
+0
+#else
+0
+#endif
+1
+2
+3
+#ifdef x
+added
+added
+#endif
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+#ifndef x
+16
+#endif
+17
+18
+#ifndef x
+19
+20
+#endif
+21
+22
+#ifndef x
+23
+24
+25
+#endif
+26
+27
+28
+29
+30
+31
+32
+#ifndef x
+33
+34
+35
+36
+37
+38
+39
+40
+#endif
diff --git a/patch-test/reppatch_def/inter b/patch-test/reppatch_def/inter
new file mode 100644
index 0000000..50d7dca
--- /dev/null
+++ b/patch-test/reppatch_def/inter
@@ -0,0 +1,35 @@
+1
+2
+3
+added
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+added
+17
+18
+21
+22
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
diff --git a/patch-test/reppatch_def/new b/patch-test/reppatch_def/new
new file mode 100644
index 0000000..450bef3
--- /dev/null
+++ b/patch-test/reppatch_def/new
@@ -0,0 +1,29 @@
+0
+1
+2
+3
+added
+added
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+17
+18
+21
+22
+26
+27
+28
+29
+30
+31
+32
diff --git a/patch-test/reppatch_def/old b/patch-test/reppatch_def/old
new file mode 100644
index 0000000..7ba036a
--- /dev/null
+++ b/patch-test/reppatch_def/old
@@ -0,0 +1,41 @@
+0
+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
diff --git a/patch-test/reppatch_def/patch b/patch-test/reppatch_def/patch
new file mode 100644
index 0000000..71ba12b
--- /dev/null
+++ b/patch-test/reppatch_def/patch
@@ -0,0 +1,32 @@
+1d0
+< 0
+4a4
+> added
+17a18
+> added
+20,21d20
+< 19
+< 20
+24,25d22
+< 23
+< 24
+39,41d35
+< 38
+< 39
+< 40
+%%%%%%%%%%%%%%%%
+0a1
+> 0
+4a6
+> added
+17,18d18
+< 16
+< added
+23d22
+< 25
+31,35d29
+< 33
+< 34
+< 35
+< 36
+< 37
diff --git a/patch-test/reppatch_def/patch-c b/patch-test/reppatch_def/patch-c
new file mode 100644
index 0000000..0fa92af
--- /dev/null
+++ b/patch-test/reppatch_def/patch-c
@@ -0,0 +1,97 @@
+*** old 2016-03-21 20:08:29.658690773 +0100
+--- inter 2016-03-21 13:57:10.940900591 +0100
+***************
+*** 1,7 ****
+- 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+--- 1,7 ----
+ 1
+ 2
+ 3
++ added
+ 4
+ 5
+ 6
+***************
+*** 15,28 ****
+ 14
+ 15
+ 16
+ 17
+ 18
+- 19
+- 20
+ 21
+ 22
+- 23
+- 24
+ 25
+ 26
+ 27
+--- 15,25 ----
+ 14
+ 15
+ 16
++ added
+ 17
+ 18
+ 21
+ 22
+ 25
+ 26
+ 27
+***************
+*** 36,41 ****
+ 35
+ 36
+ 37
+- 38
+- 39
+- 40
+--- 33,35 ----
+*** inter 2016-03-21 13:57:10.940900591 +0100
+--- new 2016-03-21 20:08:25.075356032 +0100
+***************
+*** 1,7 ****
+--- 1,9 ----
++ 0
+ 1
+ 2
+ 3
+ added
++ added
+ 4
+ 5
+ 6
+***************
+*** 14,26 ****
+ 13
+ 14
+ 15
+- 16
+- added
+ 17
+ 18
+ 21
+ 22
+- 25
+ 26
+ 27
+ 28
+--- 16,25 ----
+***************
+*** 28,35 ****
+ 30
+ 31
+ 32
+- 33
+- 34
+- 35
+- 36
+- 37
+--- 27,29 ----
diff --git a/patch-test/reppatch_def/patch-c0 b/patch-test/reppatch_def/patch-c0
new file mode 100644
index 0000000..aeb8e8d
--- /dev/null
+++ b/patch-test/reppatch_def/patch-c0
@@ -0,0 +1,57 @@
+*** old 2016-03-21 20:08:29.658690773 +0100
+--- inter 2016-03-21 13:57:10.940900591 +0100
+***************
+*** 1 ****
+- 0
+--- 0 ----
+***************
+*** 4 ****
+--- 4 ----
++ added
+***************
+*** 17 ****
+--- 18 ----
++ added
+***************
+*** 20,21 ****
+- 19
+- 20
+--- 20 ----
+***************
+*** 24,25 ****
+- 23
+- 24
+--- 22 ----
+***************
+*** 39,41 ****
+- 38
+- 39
+- 40
+--- 35 ----
+*** inter 2016-03-21 13:57:10.940900591 +0100
+--- new 2016-03-21 20:08:25.075356032 +0100
+***************
+*** 0 ****
+--- 1 ----
++ 0
+***************
+*** 4 ****
+--- 6 ----
++ added
+***************
+*** 17,18 ****
+- 16
+- added
+--- 18 ----
+***************
+*** 23 ****
+- 25
+--- 22 ----
+***************
+*** 31,35 ****
+- 33
+- 34
+- 35
+- 36
+- 37
+--- 29 ----
diff --git a/patch-test/reppatch_def/patch-c1 b/patch-test/reppatch_def/patch-c1
new file mode 100644
index 0000000..6c87bf8
--- /dev/null
+++ b/patch-test/reppatch_def/patch-c1
@@ -0,0 +1,75 @@
+*** old 2016-03-21 20:08:29.658690773 +0100
+--- inter 2016-03-21 13:57:10.940900591 +0100
+***************
+*** 1,2 ****
+- 0
+ 1
+--- 1 ----
+***************
+*** 4,5 ****
+--- 3,5 ----
+ 3
++ added
+ 4
+***************
+*** 17,26 ****
+ 16
+ 17
+ 18
+- 19
+- 20
+ 21
+ 22
+- 23
+- 24
+ 25
+--- 17,23 ----
+ 16
++ added
+ 17
+ 18
+ 21
+ 22
+ 25
+***************
+*** 38,41 ****
+ 37
+- 38
+- 39
+- 40
+--- 35 ----
+*** inter 2016-03-21 13:57:10.940900591 +0100
+--- new 2016-03-21 20:08:25.075356032 +0100
+***************
+*** 1 ****
+--- 1,2 ----
++ 0
+ 1
+***************
+*** 4,5 ****
+--- 5,7 ----
+ added
++ added
+ 4
+***************
+*** 16,19 ****
+ 15
+- 16
+- added
+ 17
+--- 18,19 ----
+***************
+*** 22,24 ****
+ 22
+- 25
+ 26
+--- 22,23 ----
+***************
+*** 30,35 ****
+ 32
+- 33
+- 34
+- 35
+- 36
+- 37
+--- 29 ----
diff --git a/patch-test/reppatch_def/patch-e b/patch-test/reppatch_def/patch-e
new file mode 100644
index 0000000..76a1b3c
--- /dev/null
+++ b/patch-test/reppatch_def/patch-e
@@ -0,0 +1,20 @@
+39,41d
+24,25d
+20,21d
+17a
+added
+.
+4a
+added
+.
+1d
+%%%%%%%%%%%%%%%%
+31,35d
+23d
+17,18d
+4a
+added
+.
+0a
+0
+.
diff --git a/patch-test/reppatch_def/patch-u b/patch-test/reppatch_def/patch-u
new file mode 100644
index 0000000..784b47c
--- /dev/null
+++ b/patch-test/reppatch_def/patch-u
@@ -0,0 +1,69 @@
+--- old 2016-03-21 20:08:29.658690773 +0100
++++ inter 2016-03-21 13:57:10.940900591 +0100
+@@ -1,7 +1,7 @@
+-0
+ 1
+ 2
+ 3
++added
+ 4
+ 5
+ 6
+@@ -15,14 +15,11 @@
+ 14
+ 15
+ 16
++added
+ 17
+ 18
+-19
+-20
+ 21
+ 22
+-23
+-24
+ 25
+ 26
+ 27
+@@ -36,6 +33,3 @@
+ 35
+ 36
+ 37
+-38
+-39
+-40
+--- inter 2016-03-21 13:57:10.940900591 +0100
++++ new 2016-03-21 20:08:25.075356032 +0100
+@@ -1,7 +1,9 @@
++0
+ 1
+ 2
+ 3
+ added
++added
+ 4
+ 5
+ 6
+@@ -14,13 +16,10 @@
+ 13
+ 14
+ 15
+-16
+-added
+ 17
+ 18
+ 21
+ 22
+-25
+ 26
+ 27
+ 28
+@@ -28,8 +27,3 @@
+ 30
+ 31
+ 32
+-33
+-34
+-35
+-36
+-37
diff --git a/patch-test/reppatch_def/patch-u0 b/patch-test/reppatch_def/patch-u0
new file mode 100644
index 0000000..390c601
--- /dev/null
+++ b/patch-test/reppatch_def/patch-u0
@@ -0,0 +1,35 @@
+--- old 2016-03-21 20:08:29.658690773 +0100
++++ inter 2016-03-21 13:57:10.940900591 +0100
+@@ -1 +0,0 @@
+-0
+@@ -4,0 +4 @@
++added
+@@ -17,0 +18 @@
++added
+@@ -20,2 +20,0 @@
+-19
+-20
+@@ -24,2 +22,0 @@
+-23
+-24
+@@ -39,3 +35,0 @@
+-38
+-39
+-40
+--- inter 2016-03-21 13:57:10.940900591 +0100
++++ new 2016-03-21 20:08:25.075356032 +0100
+@@ -0,0 +1 @@
++0
+@@ -4,0 +6 @@
++added
+@@ -17,2 +18,0 @@
+-16
+-added
+@@ -23 +22,0 @@
+-25
+@@ -31,5 +29,0 @@
+-33
+-34
+-35
+-36
+-37
diff --git a/patch-test/reppatch_def/patch-u1 b/patch-test/reppatch_def/patch-u1
new file mode 100644
index 0000000..7ba5ee4
--- /dev/null
+++ b/patch-test/reppatch_def/patch-u1
@@ -0,0 +1,51 @@
+--- old 2016-03-21 20:08:29.658690773 +0100
++++ inter 2016-03-21 13:57:10.940900591 +0100
+@@ -1,2 +1 @@
+-0
+ 1
+@@ -4,2 +3,3 @@
+ 3
++added
+ 4
+@@ -17,10 +17,7 @@
+ 16
++added
+ 17
+ 18
+-19
+-20
+ 21
+ 22
+-23
+-24
+ 25
+@@ -38,4 +35 @@
+ 37
+-38
+-39
+-40
+--- inter 2016-03-21 13:57:10.940900591 +0100
++++ new 2016-03-21 20:08:25.075356032 +0100
+@@ -1 +1,2 @@
++0
+ 1
+@@ -4,2 +5,3 @@
+ added
++added
+ 4
+@@ -16,4 +18,2 @@
+ 15
+-16
+-added
+ 17
+@@ -22,3 +22,2 @@
+ 22
+-25
+ 26
+@@ -30,6 +29 @@
+ 32
+-33
+-34
+-35
+-36
+-37