From bd9e6617827818fd043452c08c606f07b78014a0 Mon Sep 17 00:00:00 2001 From: toma Date: Wed, 25 Nov 2009 17:56:58 +0000 Subject: Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features. BUG:215923 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kompare/tests/perforce/context.diff | 8 ++++++++ kompare/tests/perforce/contextm.diff | 23 +++++++++++++++++++++++ kompare/tests/perforce/rcs.diff | 3 +++ kompare/tests/perforce/rcsm.diff | 12 ++++++++++++ kompare/tests/perforce/unified.diff | 6 ++++++ kompare/tests/perforce/unifiedm.diff | 19 +++++++++++++++++++ 6 files changed, 71 insertions(+) create mode 100644 kompare/tests/perforce/context.diff create mode 100644 kompare/tests/perforce/contextm.diff create mode 100644 kompare/tests/perforce/rcs.diff create mode 100644 kompare/tests/perforce/rcsm.diff create mode 100644 kompare/tests/perforce/unified.diff create mode 100644 kompare/tests/perforce/unifiedm.diff (limited to 'kompare/tests/perforce') diff --git a/kompare/tests/perforce/context.diff b/kompare/tests/perforce/context.diff new file mode 100644 index 00000000..a25c2461 --- /dev/null +++ b/kompare/tests/perforce/context.diff @@ -0,0 +1,8 @@ +==== //depot/testje#2 - /home/bruggie/perforce-repo/testje ==== +*************** +*** 3,5 **** +--- 3,6 ---- + + but i + 'll see what this is all about later on ++ More lines for #3 to see what happens in a multifile diff diff --git a/kompare/tests/perforce/contextm.diff b/kompare/tests/perforce/contextm.diff new file mode 100644 index 00000000..07380b31 --- /dev/null +++ b/kompare/tests/perforce/contextm.diff @@ -0,0 +1,23 @@ +==== //depot/craphola#1 - /home/bruggie/perforce-repo/craphola ==== +*************** +*** 2,4 **** +--- 2,11 ---- + I'm just adding this file to see what it does with multiple file that have differences + + Now i'll add some text more later in the #2 revision but that has to wait a bit ++ ++ This will be a copy and paste of the previous lines just to have some changes for revision 2 of this file ++ ++ This is another t4extfile used to test the perforce diff stuff ++ I'm just adding this file to see what it does with multiple file that have differences ++ ++ Now i'll add some text more later in the #2 revision but that has to wait a bit +==== //depot/testje#2 - /home/bruggie/perforce-repo/testje ==== +*************** +*** 3,5 **** +--- 3,7 ---- + + but i + 'll see what this is all about later on ++ ++ More lines for #3 to see what happens in a multifile diff diff --git a/kompare/tests/perforce/rcs.diff b/kompare/tests/perforce/rcs.diff new file mode 100644 index 00000000..ce99087d --- /dev/null +++ b/kompare/tests/perforce/rcs.diff @@ -0,0 +1,3 @@ +==== //depot/testje#2 - /home/bruggie/perforce-repo/testje ==== +a5 1 +More lines for #3 to see what happens in a multifile diff diff --git a/kompare/tests/perforce/rcsm.diff b/kompare/tests/perforce/rcsm.diff new file mode 100644 index 00000000..bee028a0 --- /dev/null +++ b/kompare/tests/perforce/rcsm.diff @@ -0,0 +1,12 @@ +==== //depot/craphola#1 - /home/bruggie/perforce-repo/craphola ==== +a4 7 + +This will be a copy and paste of the previous lines just to have some changes for revision 2 of this file + +This is another t4extfile used to test the perforce diff stuff +I'm just adding this file to see what it does with multiple file that have differences + +Now i'll add some text more later in the #2 revision but that has to wait a bit +==== //depot/testje#2 - /home/bruggie/perforce-repo/testje ==== +a5 2 +More lines for #3 to see what happens in a multifile diff diff --git a/kompare/tests/perforce/unified.diff b/kompare/tests/perforce/unified.diff new file mode 100644 index 00000000..f9235ba9 --- /dev/null +++ b/kompare/tests/perforce/unified.diff @@ -0,0 +1,6 @@ +==== //depot/testje#2 - /home/bruggie/perforce-repo/testje ==== +@@ -3,3 +3,4 @@ + + but i + 'll see what this is all about later on ++More lines for #3 to see what happens in a multifile diff diff --git a/kompare/tests/perforce/unifiedm.diff b/kompare/tests/perforce/unifiedm.diff new file mode 100644 index 00000000..6aa832e7 --- /dev/null +++ b/kompare/tests/perforce/unifiedm.diff @@ -0,0 +1,19 @@ +==== //depot/craphola#1 - /home/bruggie/perforce-repo/craphola ==== +@@ -2,3 +2,10 @@ + I'm just adding this file to see what it does with multiple file that have differences + + Now i'll add some text more later in the #2 revision but that has to wait a bit ++ ++This will be a copy and paste of the previous lines just to have some changes for revision 2 of this file ++ ++This is another t4extfile used to test the perforce diff stuff ++I'm just adding this file to see what it does with multiple file that have differences ++ ++Now i'll add some text more later in the #2 revision but that has to wait a bit +==== //depot/testje#2 - /home/bruggie/perforce-repo/testje ==== +@@ -3,3 +3,5 @@ + + but i + 'll see what this is all about later on ++ ++More lines for #3 to see what happens in a multifile diff -- cgit v1.2.1