From caa881729a9d394fec28b952fc111c6008613e55 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 23 Mar 2016 13:27:51 +0100 Subject: initial import MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- patch-test/26/def | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ patch-test/26/new | 37 ++++++++++++++++++++++++++++++++++ patch-test/26/old | 40 +++++++++++++++++++++++++++++++++++++ patch-test/26/patch-c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ patch-test/26/patch-c0 | 26 ++++++++++++++++++++++++ patch-test/26/patch-c1 | 36 +++++++++++++++++++++++++++++++++ patch-test/26/patch-e | 10 ++++++++++ patch-test/26/patch-u | 41 ++++++++++++++++++++++++++++++++++++++ patch-test/26/patch-u0 | 16 +++++++++++++++ patch-test/26/patch-u1 | 25 +++++++++++++++++++++++ 10 files changed, 339 insertions(+) create mode 100644 patch-test/26/def create mode 100644 patch-test/26/new create mode 100644 patch-test/26/old create mode 100644 patch-test/26/patch-c create mode 100644 patch-test/26/patch-c0 create mode 100644 patch-test/26/patch-c1 create mode 100644 patch-test/26/patch-e create mode 100644 patch-test/26/patch-u create mode 100644 patch-test/26/patch-u0 create mode 100644 patch-test/26/patch-u1 (limited to 'patch-test/26') diff --git a/patch-test/26/def b/patch-test/26/def new file mode 100644 index 0000000..936c257 --- /dev/null +++ b/patch-test/26/def @@ -0,0 +1,54 @@ +#ifndef x +int +main(void) { + b +#else +void +kmain(void) { +#endif + a + a + a + a + a + a + a + a +#ifndef x + b +#endif + a + a + a + a + a + a + a +#ifdef x + c +#endif + a + a + a + a + a + a + a +#ifndef x + b +#endif + a + a + a + a + a + a + a + a + a + a + a +#ifndef x + b +#endif +} diff --git a/patch-test/26/new b/patch-test/26/new new file mode 100644 index 0000000..686b6a1 --- /dev/null +++ b/patch-test/26/new @@ -0,0 +1,37 @@ +void +kmain(void) { + 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/26/old b/patch-test/26/old new file mode 100644 index 0000000..2bf508e --- /dev/null +++ b/patch-test/26/old @@ -0,0 +1,40 @@ +int +main(void) { + 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/26/patch-c b/patch-test/26/patch-c new file mode 100644 index 0000000..ddf8538 --- /dev/null +++ b/patch-test/26/patch-c @@ -0,0 +1,54 @@ +*** old 2016-03-18 23:20:46.950128155 +0100 +--- new 2016-03-18 23:20:45.210127585 +0100 +*************** +*** 1,6 **** +! int +! main(void) { +! b + a + a + a +--- 1,5 ---- +! void +! kmain(void) { + a + a + a +*************** main(void) { +*** 9,15 **** + a + a + a +- b + a + a + a +--- 8,13 ---- +*************** main(void) { +*** 17,22 **** +--- 15,21 ---- + a + a + a ++ c + a + a + a +*************** main(void) { +*** 24,30 **** + a + a + a +- b + a + a + a +--- 23,28 ---- +*************** main(void) { +*** 36,40 **** + a + a + a +- b + } +--- 34,37 ---- diff --git a/patch-test/26/patch-c0 b/patch-test/26/patch-c0 new file mode 100644 index 0000000..675dce6 --- /dev/null +++ b/patch-test/26/patch-c0 @@ -0,0 +1,26 @@ +*** old 2016-03-18 23:20:46.950128155 +0100 +--- new 2016-03-18 23:20:45.210127585 +0100 +*************** +*** 1,3 **** +! int +! main(void) { +! b +--- 1,2 ---- +! void +! kmain(void) { +*************** main(void) { +*** 12 **** +- b +--- 10 ---- +*************** main(void) { +*** 19 **** +--- 18 ---- ++ c +*************** main(void) { +*** 27 **** +- b +--- 25 ---- +*************** main(void) { +*** 39 **** +- b +--- 36 ---- diff --git a/patch-test/26/patch-c1 b/patch-test/26/patch-c1 new file mode 100644 index 0000000..a38c2aa --- /dev/null +++ b/patch-test/26/patch-c1 @@ -0,0 +1,36 @@ +*** old 2016-03-18 23:20:46.950128155 +0100 +--- new 2016-03-18 23:20:45.210127585 +0100 +*************** +*** 1,4 **** +! int +! main(void) { +! b + a +--- 1,3 ---- +! void +! kmain(void) { + a +*************** main(void) { +*** 11,13 **** + a +- b + a +--- 10,11 ---- +*************** main(void) { +*** 19,20 **** +--- 17,19 ---- + a ++ c + a +*************** main(void) { +*** 26,28 **** + a +- b + a +--- 25,26 ---- +*************** main(void) { +*** 38,40 **** + a +- b + } +--- 36,37 ---- diff --git a/patch-test/26/patch-e b/patch-test/26/patch-e new file mode 100644 index 0000000..8749c83 --- /dev/null +++ b/patch-test/26/patch-e @@ -0,0 +1,10 @@ +39d +27d +19a + c +. +12d +1,3c +void +kmain(void) { +. diff --git a/patch-test/26/patch-u b/patch-test/26/patch-u new file mode 100644 index 0000000..dd45521 --- /dev/null +++ b/patch-test/26/patch-u @@ -0,0 +1,41 @@ +--- old 2016-03-18 23:20:46.950128155 +0100 ++++ new 2016-03-18 23:20:45.210127585 +0100 +@@ -1,6 +1,5 @@ +-int +-main(void) { +- b ++void ++kmain(void) { + a + a + a +@@ -9,7 +8,6 @@ main(void) { + a + a + a +- b + a + a + a +@@ -17,6 +15,7 @@ main(void) { + a + a + a ++ c + a + a + a +@@ -24,7 +23,6 @@ main(void) { + a + a + a +- b + a + a + a +@@ -36,5 +34,4 @@ main(void) { + a + a + a +- b + } diff --git a/patch-test/26/patch-u0 b/patch-test/26/patch-u0 new file mode 100644 index 0000000..4ce1dfd --- /dev/null +++ b/patch-test/26/patch-u0 @@ -0,0 +1,16 @@ +--- old 2016-03-18 23:20:46.950128155 +0100 ++++ new 2016-03-18 23:20:45.210127585 +0100 +@@ -1,3 +1,2 @@ +-int +-main(void) { +- b ++void ++kmain(void) { +@@ -12 +10,0 @@ main(void) { +- b +@@ -19,0 +18 @@ main(void) { ++ c +@@ -27 +25,0 @@ main(void) { +- b +@@ -39 +36,0 @@ main(void) { +- b diff --git a/patch-test/26/patch-u1 b/patch-test/26/patch-u1 new file mode 100644 index 0000000..10f09d2 --- /dev/null +++ b/patch-test/26/patch-u1 @@ -0,0 +1,25 @@ +--- old 2016-03-18 23:20:46.950128155 +0100 ++++ new 2016-03-18 23:20:45.210127585 +0100 +@@ -1,4 +1,3 @@ +-int +-main(void) { +- b ++void ++kmain(void) { + a +@@ -11,3 +10,2 @@ main(void) { + a +- b + a +@@ -19,2 +17,3 @@ main(void) { + a ++ c + a +@@ -26,3 +25,2 @@ main(void) { + a +- b + a +@@ -38,3 +36,2 @@ main(void) { + a +- b + } -- cgit v1.2.3-70-g09d2