Attachment 80218 Details for Bug 199846 – More tests for the bug

[patch] More tests for the bug

patch_199846_20071012_test.txt (text/plain), 48.05 KB, created by Tomasz Zarna

on 2007-10-12 07:10:47 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Zarna

Created: 2007-10-12 07:10:47 EDT

Size: 48.05 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.compare.tests
>Index: src/org/eclipse/compare/tests/PatchTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchTest.java,v
>retrieving revision 1.13
>diff -u -r1.13 PatchTest.java
>--- src/org/eclipse/compare/tests/PatchTest.java	25 Sep 2007 12:42:46 -0000	1.13
>+++ src/org/eclipse/compare/tests/PatchTest.java	12 Oct 2007 11:05:41 -0000
>@@ -52,7 +52,7 @@
> import org.eclipse.core.runtime.FileLocator;
> import org.eclipse.core.runtime.IPath;
> import org.eclipse.core.runtime.IStatus;
>-import org.eclipse.core.runtime.NullProgressMonitor;
>+//import org.eclipse.core.runtime.NullProgressMonitor;
> import org.eclipse.core.runtime.Path;
> import org.eclipse.core.runtime.Platform;
> import org.eclipse.core.runtime.Status;
>@@ -187,37 +187,37 @@
> 	//Test creation of new workspace patch 
> 	public void testWorkspacePatch_Create(){
> 		//Note the order that exists in the array of expected results is based purely on the order of the files in the patch 
>-		patchWorkspace(new String[]{"addition.txt", "addition.txt"}, "patch_workspacePatchAddition.txt", new String[] { "exp_workspacePatchAddition2.txt","exp_workspacePatchAddition.txt"}, false, false);   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
>+		patchWorkspace(new String[]{"addition.txt", "addition.txt"}, "patch_workspacePatchAddition.txt", new String[] { "exp_workspacePatchAddition2.txt","exp_workspacePatchAddition.txt"}, false, 0);   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
> 	}
> 	
> 	//Test applying the reverse of workspace creation patch 
> 	public void testWorkspacePatch_Create_Reverse(){
> 		//Note the order that exists in the array of expected results is based purely on the order of the files in the patch 
>-		patchWorkspace(new String[]{"exp_workspacePatchAddition2.txt","exp_workspacePatchAddition.txt"}, "patch_workspacePatchAddition.txt", new String[] {"addition.txt", "addition.txt"}, true, false);   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
>+		patchWorkspace(new String[]{"exp_workspacePatchAddition2.txt","exp_workspacePatchAddition.txt"}, "patch_workspacePatchAddition.txt", new String[] {"addition.txt", "addition.txt"}, true, 0);   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
> 	}
> 	
> 	//Test the patching of an already existing file, the creation of a new one and the deletion of elements in a file
> 	public void testWorkspacePatch_Modify(){
> 		//Note the order that exists in the array of expected results is based purely on the order of the files in the patch 
>-		patchWorkspace(new String[]{"exp_workspacePatchAddition2.txt","exp_workspacePatchAddition.txt", "addition.txt"}, "patch_workspacePatchMod.txt", new String[] { "exp_workspacePatchMod1.txt","exp_workspacePatchMod2.txt", "exp_workspacePatchMod3.txt"}, false, false );   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
>+		patchWorkspace(new String[]{"exp_workspacePatchAddition2.txt","exp_workspacePatchAddition.txt", "addition.txt"}, "patch_workspacePatchMod.txt", new String[] { "exp_workspacePatchMod1.txt","exp_workspacePatchMod2.txt", "exp_workspacePatchMod3.txt"}, false, 0 );   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
> 	}
> 	
> 	//Test applying the reverse of a workspace modify patch
> 	public void testWorkspacePatch_Modify_Reverse(){
> 		//Note the order that exists in the array of expected results is based purely on the order of the files in the patch 
>-		patchWorkspace(new String[]{ "exp_workspacePatchMod1.txt","exp_workspacePatchMod2.txt", "exp_workspacePatchMod3.txt"}, "patch_workspacePatchMod.txt", new String[] {"exp_workspacePatchAddition2.txt","exp_workspacePatchAddition.txt", "addition.txt"}, true, false );   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
>+		patchWorkspace(new String[]{ "exp_workspacePatchMod1.txt","exp_workspacePatchMod2.txt", "exp_workspacePatchMod3.txt"}, "patch_workspacePatchMod.txt", new String[] {"exp_workspacePatchAddition2.txt","exp_workspacePatchAddition.txt", "addition.txt"}, true, 0 );   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
> 	}
> 	
> 	//Tests the deletion of an already existing file, and the modification of another file
> 	public void testWorkspacePatch_Delete(){
> 		//Note the order that exists in the array of expected results is based purely on the order of the files in the patch 
>-		patchWorkspace(new String[]{"exp_workspacePatchMod2.txt","addition.txt", "exp_workspacePatchMod1.txt","addition.txt"}, "patch_workspacePatchDelete.txt", new String[] { "addition.txt","exp_workspacePatchDelete2.txt", "addition.txt", "exp_workspacePatchDelete1.txt"}, false, false );   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
>+		patchWorkspace(new String[]{"exp_workspacePatchMod2.txt","addition.txt", "exp_workspacePatchMod1.txt","addition.txt"}, "patch_workspacePatchDelete.txt", new String[] { "addition.txt","exp_workspacePatchDelete2.txt", "addition.txt", "exp_workspacePatchDelete1.txt"}, false, 0 );   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
> 	}
> 	
> 	//Test applying the reverse of a workspace deletion patch
> 	public void testWorkspacePatch_Delete_Reverse(){
> 		//Note the order that exists in the array of expected results is based purely on the order of the files in the patch 
>-		patchWorkspace(new String[]{"addition.txt","exp_workspacePatchDelete2.txt", "addition.txt", "exp_workspacePatchDelete1.txt" }, "patch_workspacePatchDelete.txt", new String[] {"exp_workspacePatchMod2.txt","addition.txt", "exp_workspacePatchMod1.txt","addition.txt"}, true, false );   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
>+		patchWorkspace(new String[]{"addition.txt","exp_workspacePatchDelete2.txt", "addition.txt", "exp_workspacePatchDelete1.txt" }, "patch_workspacePatchDelete.txt", new String[] {"exp_workspacePatchMod2.txt","addition.txt", "exp_workspacePatchMod1.txt","addition.txt"}, true, 0 );   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
> 	}
> 	
> 	// Keeps track of the failures
>@@ -250,11 +250,24 @@
> 			String msg = "Test for subfolder [patchdata/" + subfolder
> 					+ "] failed.";
> 
>+			// get the fuzz factor for the patch if provided
>+			// TODO: what if fuzz > 3
>+			String patch = filenames[1].substring(subfolder.length());
>+			int fuzz = -1;
>+			if (patch.indexOf("fuzz3") > -1 || patch.indexOf("f3") > -1)
>+				fuzz = 3;
>+			if (patch.indexOf("fuzz2") > -1 || patch.indexOf("f2") > -1)
>+				fuzz = 2;
>+			if (patch.indexOf("fuzz1") > -1 || patch.indexOf("f1") > -1)
>+				fuzz = 1;
>+			if (patch.indexOf("fuzz0") > -1 || patch.indexOf("f0") > -1)
>+				fuzz = 0;
>+			
> 			try {
> 				// test with expected result
> 				patchWorkspace(msg, new String[] { filenames[0] },
> 						filenames[1], new String[] { filenames[2] }, false,
>-						true);
>+						fuzz);
> 			} catch (AssertionFailedError e) {
> 				failures.add(e);
> 			}
>@@ -264,7 +277,7 @@
> 				try {
> 					patchWorkspace(msg, new String[] { filenames[0] },
> 							filenames[1], new String[] { filenames[3] }, false,
>-							true);
>+							fuzz);
> 				} catch (AssertionFailedError e) {
> 					// a failure is expected
> 					continue; // continue with a next subfolder
>@@ -520,30 +533,33 @@
> 	
> 	private void patchWorkspace(String[] originalFiles, String patch,
> 			String[] expectedOutcomeFiles, boolean reverse,
>-			boolean guessFuzzFactor) {
>+			int fuzzFactor) {
> 		patchWorkspace(null, originalFiles, patch, expectedOutcomeFiles,
>-				reverse, guessFuzzFactor);
>+				reverse, fuzzFactor);
> 	}
> 	
> 	/**
> 	 * Parses a workspace patch and applies the diffs to the appropriate files
>+	 * 
> 	 * @param msg
> 	 * @param originalFiles
> 	 * @param patch
> 	 * @param expectedOutcomeFiles
> 	 * @param reverse
>-	 * @param guessFuzzFactor TODO
>+	 * @param fuzzFactor
>+	 *            The fuzz factor to use, ranging from 0 (all context must
>+	 *            match) to 2 (the default maximum fuzz factor). <code>-1</code>
>+	 *            means that the fuzz factor should be calculated automatically.
> 	 */
>-	private void patchWorkspace(String msg, String[] originalFiles, String patch, String[] expectedOutcomeFiles, boolean reverse, boolean guessFuzzFactor) {
>+	private void patchWorkspace(String msg, String[] originalFiles, String patch, String[] expectedOutcomeFiles, boolean reverse, int fuzzFactor) {
> 		
> 		//ensure that we have the same number of input files as we have expected files
> 		Assert.assertEquals(originalFiles.length, expectedOutcomeFiles.length);
> 		
>-		//Parse the passed in patch and extract all the Diffs
>-		WorkspacePatcher patcher= new WorkspacePatcher();
>+		// Parse the passed in patch and extract all the Diffs
>+		WorkspacePatcher patcher = new WorkspacePatcher();
> 		try {
>-			if (guessFuzzFactor)
>-				patcher.getConfiguration().setFuzz(patcher.guessFuzzFactor(new NullProgressMonitor()));
>+			patcher.getConfiguration().setFuzz(fuzzFactor);
> 			patcher.parse(getReader(patch));
> 			patcher.setReversed(reverse);
> 		} catch (IOException e) {
>@@ -558,7 +574,6 @@
> 		for (int i = 0; i < originalFiles.length; i++) {	
> 			LineReader lr= new LineReader(getReader(originalFiles[i]));
> 			List inLines= lr.readLines();
>-			
> 		
> 			FileDiffResult diffResult = patcher.getDiffResult(diffs[i]);
> 			diffResult.patch(inLines, null);
>Index: src/org/eclipse/compare/tests/patchdata/addition_autofuzz-f2/exp_context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/addition_autofuzz-f2/exp_context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/addition_autofuzz-f2/exp_context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/addition_autofuzz-f2/exp_context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,25 @@
>+[a]
>+[b]
>+[c]
>+[d]
>+[e]
>+[f]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[M]
>+[M1]
>+[M2]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/2hunks_switch_fail/patch.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/2hunks_switch_fail/patch.txt
>diff -N src/org/eclipse/compare/tests/patchdata/2hunks_switch_fail/patch.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/2hunks_switch_fail/patch.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,27 @@
>+#
>+diff -u -N context.txt context.txt
>+--- context.txt	2007-06-27 08:50:46.000000603 -0400
>++++ context.txt	2007-07-11 17:24:45.000000000 -0400
>+@@ -1,3 +1,3 @@
>+ [r]
>+ [s]
>+ [t]
>+-[U]
>+-[V]
>+-[W]
>++[U1]
>++[V1]
>++[W1]
>+@@ -20,3 +20,3 @@
>+ [a]
>+ [b]
>+ [c]
>+-[D]
>+-[E]
>+-[F]
>++[D1]
>++[E1]
>++[F1]
>+ [g]
>+ [h]
>+ [i]
>Index: src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_begin/patch_f1.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_begin/patch_f1.txt
>diff -N src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_begin/patch_f1.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_begin/patch_f1.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,12 @@
>+#
>+diff -u -N context.txt context.txt
>+--- context.txt	2007-06-27 08:50:46.000000603 -0400
>++++ context.txt	2007-07-11 17:24:45.000000000 -0400
>+@@ -10,5 +10,5 @@
>+-[A]
>+-[B]
>++[A1]
>++[B1]
>+ [c]
>+ [d]
>+ [Xe]
>Index: src/org/eclipse/compare/tests/patchdata/fuzz2/context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/fuzz2/context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/fuzz2/context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/fuzz2/context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[D]
>+[E]
>+[F]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/deletion_autofuzz/patch.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/deletion_autofuzz/patch.txt
>diff -N src/org/eclipse/compare/tests/patchdata/deletion_autofuzz/patch.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/deletion_autofuzz/patch.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,12 @@
>+#
>+diff -u -N context.txt context.txt
>+--- context.txt	2007-06-27 08:50:46.000000603 -0400
>++++ context.txt	2007-07-11 17:24:45.000000000 -0400
>+@@ -1,7 +1,6 @@
>+ [Xj]
>+ [Xk]
>+ [l]
>+-[M]
>+ [n]
>+ [Xo]
>+ [Xp]
>Index: src/org/eclipse/compare/tests/patchdata/shiftdown_f0/exp_context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/shiftdown_f0/exp_context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/shiftdown_f0/exp_context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/shiftdown_f0/exp_context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[D]
>+[E]
>+[F]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[D1]
>+[E1]
>+[F1]
>+[r]
>+[s]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/fuzz2/exp_context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/fuzz2/exp_context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/fuzz2/exp_context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/fuzz2/exp_context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[D1]
>+[E1]
>+[F1]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/2hunks_shift_autofuzz-1/patch.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/2hunks_shift_autofuzz-1/patch.txt
>diff -N src/org/eclipse/compare/tests/patchdata/2hunks_shift_autofuzz-1/patch.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/2hunks_shift_autofuzz-1/patch.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,30 @@
>+#
>+diff -u -N context.txt context.txt
>+--- context.txt	2007-06-27 08:50:46.000000603 -0400
>++++ context.txt	2007-07-11 17:24:45.000000000 -0400
>+@@ -1,2 +1,4 @@
>+ [b]
>+ [c]
>+ [d]
>+-[E]
>+-[F]
>++[E1]
>++[F1]
>++[F2]
>++[F3]
>+ [g]
>+ [h]
>+ [Xi]
>+@@ -10,3 +10,3 @@
>+ [n]
>+ [o]
>+ [p]
>+-[Q]
>+-[R]
>+-[S]
>++[Q1]
>++[R1]
>++[S1]
>+ [t]
>+ [Xu]
>+ [Xv]
>Index: src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f1/context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f1/context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f1/context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f1/context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[D]
>+[E]
>+[F]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[o]
>+[p]
>+[Q]
>+[R]
>+[S]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_end/context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_end/context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_end/context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_end/context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[d]
>+[e]
>+[f]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[u]
>+[V]
>+[W]
>Index: src/org/eclipse/compare/tests/patchdata/addition_shift_f3_misplaced/exp_context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/addition_shift_f3_misplaced/exp_context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/addition_shift_f3_misplaced/exp_context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/addition_shift_f3_misplaced/exp_context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,25 @@
>+[a]
>+[b]
>+[c]
>+[M1]
>+[M2]
>+[d]
>+[e]
>+[f]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[M]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/fuzz1/context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/fuzz1/context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/fuzz1/context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/fuzz1/context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[d]
>+[e]
>+[f]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/shift_correct/patch_f0.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/shift_correct/patch_f0.txt
>diff -N src/org/eclipse/compare/tests/patchdata/shift_correct/patch_f0.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/shift_correct/patch_f0.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,9 @@
>+#
>+diff -u -N context.txt context.txt
>+--- context.txt	2007-06-27 08:50:46.000000603 -0400
>++++ context.txt	2007-07-11 17:24:45.000000000 -0400
>+@@ -13,3 +13,3 @@
>+ [c]
>+-[D]
>++[D1]
>+ [e]
>Index: src/org/eclipse/compare/tests/patchdata/shiftdown_f0/context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/shiftdown_f0/context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/shiftdown_f0/context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/shiftdown_f0/context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[D]
>+[E]
>+[F]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[D]
>+[E]
>+[F]
>+[r]
>+[s]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f2/patch.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f2/patch.txt
>diff -N src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f2/patch.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f2/patch.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,29 @@
>+#
>+diff -u -N context.txt context.txt
>+--- context.txt	2007-06-27 08:50:46.000000603 -0400
>++++ context.txt	2007-07-11 17:24:45.000000000 -0400
>+@@ -1,3 +1,2 @@
>+ [a]
>+ [b]
>+ [c]
>+-[D]
>+-[E]
>+-[F]
>++[D1]
>++[E1]
>+ [g]
>+ [h]
>+ [i]
>+@@ -14,3 +14,3 @@
>+ [Xn]
>+ [o]
>+ [p]
>+-[Q]
>+-[R]
>+-[S]
>++[Q1]
>++[R1]
>++[S1]
>+ [t]
>+ [Xu]
>+ [Xv]
>Index: src/org/eclipse/compare/tests/patchdata/deletion_shift_f2/patch_f2.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/deletion_shift_f2/patch_f2.txt
>diff -N src/org/eclipse/compare/tests/patchdata/deletion_shift_f2/patch_f2.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/deletion_shift_f2/patch_f2.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,12 @@
>+#
>+diff -u -N context.txt context.txt
>+--- context.txt	2007-06-27 08:50:46.000000603 -0400
>++++ context.txt	2007-07-11 17:24:45.000000000 -0400
>+@@ -9,7 +9,6 @@
>+ [Xj]
>+ [k]
>+ [l]
>+-[M]
>+ [n]
>+ [Xo]
>+ [Xp]
>Index: src/org/eclipse/compare/tests/patchdata/2hunks_switch/exp_context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/2hunks_switch/exp_context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/2hunks_switch/exp_context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/2hunks_switch/exp_context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[D1]
>+[E1]
>+[F1]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[o]
>+[p]
>+[Q1]
>+[R1]
>+[S1]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/deletion_shift_f3_missplaced/exp_context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/deletion_shift_f3_missplaced/exp_context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/deletion_shift_f3_missplaced/exp_context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/deletion_shift_f3_missplaced/exp_context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,22 @@
>+[a]
>+[b]
>+[c]
>+[e]
>+[f]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[M]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/fuzz2/patch_f2.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/fuzz2/patch_f2.txt
>diff -N src/org/eclipse/compare/tests/patchdata/fuzz2/patch_f2.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/fuzz2/patch_f2.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,17 @@
>+#
>+diff -u -N context.txt context.txt
>+--- context.txt	2007-06-27 08:50:46.000000603 -0400
>++++ context.txt	2007-07-11 17:24:45.000000000 -0400
>+@@ -1,3 +1,3 @@
>+ [Xa]
>+ [Xb]
>+ [c]
>+-[D]
>+-[E]
>+-[F]
>++[D1]
>++[E1]
>++[F1]
>+ [g]
>+ [Xh]
>+ [Xi]
>Index: src/org/eclipse/compare/tests/patchdata/addition_autofuzz-f2/patch.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/addition_autofuzz-f2/patch.txt
>diff -N src/org/eclipse/compare/tests/patchdata/addition_autofuzz-f2/patch.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/addition_autofuzz-f2/patch.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,13 @@
>+#
>+diff -u -N context.txt context.txt
>+--- context.txt	2007-06-27 08:50:46.000000603 -0400
>++++ context.txt	2007-07-11 17:24:45.000000000 -0400
>+@@ -11,6 +11,8 @@
>+ [Xk]
>+ [l]
>+ [M]
>++[M1]
>++[M2]
>+ [n]
>+ [Xo]
>+ [Xp]
>Index: src/org/eclipse/compare/tests/patchdata/2hunks_switch/patch.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/2hunks_switch/patch.txt
>diff -N src/org/eclipse/compare/tests/patchdata/2hunks_switch/patch.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/2hunks_switch/patch.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,30 @@
>+#
>+diff -u -N context.txt context.txt
>+--- context.txt	2007-06-27 08:50:46.000000603 -0400
>++++ context.txt	2007-07-11 17:24:45.000000000 -0400
>+@@ -2,3 +2,3 @@
>+ [n]
>+ [o]
>+ [p]
>+-[Q]
>+-[R]
>+-[S]
>++[Q1]
>++[R1]
>++[S1]
>+ [t]
>+ [u]
>+ [v]
>+@@ -10,3 +10,3 @@
>+ [a]
>+ [b]
>+ [c]
>+-[D]
>+-[E]
>+-[F]
>++[D1]
>++[E1]
>++[F1]
>+ [g]
>+ [h]
>+ [i]
>Index: src/org/eclipse/compare/tests/patchdata/shiftdown_f2/patch_f2.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/shiftdown_f2/patch_f2.txt
>diff -N src/org/eclipse/compare/tests/patchdata/shiftdown_f2/patch_f2.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/shiftdown_f2/patch_f2.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,17 @@
>+#
>+diff -u -N context.txt context.txt
>+--- context.txt	2007-06-27 08:50:46.000000603 -0400
>++++ context.txt	2007-07-11 17:24:45.000000000 -0400
>+@@ -5,3 +5,3 @@
>+ [Xl]
>+ [Xm]
>+ [n]
>+-[D]
>+-[E]
>+-[F]
>++[D1]
>++[E1]
>++[F1]
>+ [r]
>+ [Xs]
>+ [Xt]
>Index: src/org/eclipse/compare/tests/patchdata/deletion_shift_f3_missplaced/patch_f3.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/deletion_shift_f3_missplaced/patch_f3.txt
>diff -N src/org/eclipse/compare/tests/patchdata/deletion_shift_f3_missplaced/patch_f3.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/deletion_shift_f3_missplaced/patch_f3.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,12 @@
>+#
>+diff -u -N context.txt context.txt
>+--- context.txt	2007-06-27 08:50:46.000000603 -0400
>++++ context.txt	2007-07-11 17:24:45.000000000 -0400
>+@@ -9,7 +9,6 @@
>+ [Xj]
>+ [Xk]
>+ [Xl]
>+-[M]
>+ [Xn]
>+ [Xo]
>+ [Xp]
>Index: src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f1/exp_context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f1/exp_context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f1/exp_context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f1/exp_context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[D1]
>+[E1]
>+[F1]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[o]
>+[p]
>+[Q1]
>+[R1]
>+[S1]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/deletion_autofuzz/exp_context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/deletion_autofuzz/exp_context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/deletion_autofuzz/exp_context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/deletion_autofuzz/exp_context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,22 @@
>+[a]
>+[b]
>+[c]
>+[d]
>+[e]
>+[f]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/2hunks_switch/context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/2hunks_switch/context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/2hunks_switch/context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/2hunks_switch/context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[D]
>+[E]
>+[F]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[o]
>+[p]
>+[Q]
>+[R]
>+[S]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_end/patch_f1.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_end/patch_f1.txt
>diff -N src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_end/patch_f1.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_end/patch_f1.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,12 @@
>+#
>+diff -u -N context.txt context.txt
>+--- context.txt	2007-06-27 08:50:46.000000603 -0400
>++++ context.txt	2007-07-11 17:24:45.000000000 -0400
>+@@ -10,5 +10,5 @@
>+ [Xs]
>+ [t]
>+ [u]
>+-[V]
>+-[W]
>++[V1]
>++[W1]
>Index: src/org/eclipse/compare/tests/patchdata/autofuzz-f2/exp_context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/autofuzz-f2/exp_context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/autofuzz-f2/exp_context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/autofuzz-f2/exp_context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[d]
>+[e]
>+[f]
>+[g]
>+[h]
>+[i]
>+[j]
>+[K1]
>+[L1]
>+[M1]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/shiftdown_f2/context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/shiftdown_f2/context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/shiftdown_f2/context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/shiftdown_f2/context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[D]
>+[E]
>+[F]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[D]
>+[E]
>+[F]
>+[r]
>+[s]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/autofuzz-f2/patch.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/autofuzz-f2/patch.txt
>diff -N src/org/eclipse/compare/tests/patchdata/autofuzz-f2/patch.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/autofuzz-f2/patch.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,17 @@
>+#
>+diff -u -N context.txt context.txt
>+--- context.txt	2007-06-27 08:50:46.000000603 -0400
>++++ context.txt	2007-07-11 17:24:45.000000000 -0400
>+@@ -8,3 +8,3 @@
>+ [Xh]
>+ [i]
>+ [j]
>+-[K]
>+-[L]
>+-[M]
>++[K1]
>++[L1]
>++[M1]
>+ [n]
>+ [Xo]
>+ [Xp]
>Index: src/org/eclipse/compare/tests/patchdata/deletion_autofuzz/context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/deletion_autofuzz/context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/deletion_autofuzz/context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/deletion_autofuzz/context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[d]
>+[e]
>+[f]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[M]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f2/exp_context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f2/exp_context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f2/exp_context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f2/exp_context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,22 @@
>+[a]
>+[b]
>+[c]
>+[D1]
>+[E1]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[o]
>+[p]
>+[Q1]
>+[R1]
>+[S1]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/fuzz1/patch_f1.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/fuzz1/patch_f1.txt
>diff -N src/org/eclipse/compare/tests/patchdata/fuzz1/patch_f1.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/fuzz1/patch_f1.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,17 @@
>+#
>+diff -u -N context.txt context.txt
>+--- context.txt	2007-06-27 08:50:46.000000603 -0400
>++++ context.txt	2007-07-11 17:24:45.000000000 -0400
>+@@ -1,3 +1,3 @@
>+ [X]
>+ [b]
>+ [c]
>+-[d]
>+-[e]
>+-[f]
>++[d1]
>++[e1]
>++[f1]
>+ [g]
>+ [h]
>+ [X]
>Index: src/org/eclipse/compare/tests/patchdata/shift_correct/exp_context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/shift_correct/exp_context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/shift_correct/exp_context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/shift_correct/exp_context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[D]
>+[e]
>+[f]
>+[g]
>+[h]
>+[i]
>+[c]
>+[D1]
>+[e]
>+[m]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[c]
>+[D]
>+[e]
>Index: src/org/eclipse/compare/tests/patchdata/addition_shift_f3_misplaced/patch_f3.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/addition_shift_f3_misplaced/patch_f3.txt
>diff -N src/org/eclipse/compare/tests/patchdata/addition_shift_f3_misplaced/patch_f3.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/addition_shift_f3_misplaced/patch_f3.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,13 @@
>+#
>+diff -u -N context.txt context.txt
>+--- context.txt	2007-06-27 08:50:46.000000603 -0400
>++++ context.txt	2007-07-11 17:24:45.000000000 -0400
>+@@ -1,6 +1,8 @@
>+ [Xk]
>+ [Xl]
>+ [XM]
>++[M1]
>++[M2]
>+ [Xn]
>+ [Xo]
>+ [Xp]
>Index: src/org/eclipse/compare/tests/patchdata/autofuzz-f2/context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/autofuzz-f2/context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/autofuzz-f2/context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/autofuzz-f2/context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[d]
>+[e]
>+[f]
>+[g]
>+[h]
>+[i]
>+[j]
>+[K]
>+[L]
>+[M]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/fuzz1/exp_context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/fuzz1/exp_context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/fuzz1/exp_context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/fuzz1/exp_context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[d1]
>+[e1]
>+[f1]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/autofuzz-f1/patch.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/autofuzz-f1/patch.txt
>diff -N src/org/eclipse/compare/tests/patchdata/autofuzz-f1/patch.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/autofuzz-f1/patch.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,17 @@
>+#
>+diff -u -N context.txt context.txt
>+--- context.txt	2007-06-27 08:50:46.000000603 -0400
>++++ context.txt	2007-07-11 17:24:45.000000000 -0400
>+@@ -1,3 +1,3 @@
>+ [X]
>+ [b]
>+ [c]
>+-[d]
>+-[e]
>+-[f]
>++[d1]
>++[e1]
>++[f1]
>+ [g]
>+ [h]
>+ [X]
>Index: src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f1/patch.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f1/patch.txt
>diff -N src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f1/patch.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f1/patch.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,30 @@
>+#
>+diff -u -N context.txt context.txt
>+--- context.txt	2007-06-27 08:50:46.000000603 -0400
>++++ context.txt	2007-07-11 17:24:45.000000000 -0400
>+@@ -1,3 +1,3 @@
>+ [a]
>+ [b]
>+ [c]
>+-[D]
>+-[E]
>+-[F]
>++[D1]
>++[E1]
>++[F1]
>+ [g]
>+ [h]
>+ [i]
>+@@ -14,3 +14,3 @@
>+ [Xn]
>+ [o]
>+ [p]
>+-[Q]
>+-[R]
>+-[S]
>++[Q1]
>++[R1]
>++[S1]
>+ [t]
>+ [u]
>+ [Xv]
>Index: src/org/eclipse/compare/tests/patchdata/shiftdown_f0/patch_f0.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/shiftdown_f0/patch_f0.txt
>diff -N src/org/eclipse/compare/tests/patchdata/shiftdown_f0/patch_f0.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/shiftdown_f0/patch_f0.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,17 @@
>+#
>+diff -u -N context.txt context.txt
>+--- context.txt	2007-06-27 08:50:46.000000603 -0400
>++++ context.txt	2007-07-11 17:24:45.000000000 -0400
>+@@ -2,3 +2,3 @@
>+ [l]
>+ [m]
>+ [n]
>+-[D]
>+-[E]
>+-[F]
>++[D1]
>++[E1]
>++[F1]
>+ [r]
>+ [s]
>+ [t]
>Index: src/org/eclipse/compare/tests/patchdata/deletion_shift_f2/exp_context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/deletion_shift_f2/exp_context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/deletion_shift_f2/exp_context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/deletion_shift_f2/exp_context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,22 @@
>+[a]
>+[b]
>+[c]
>+[d]
>+[e]
>+[f]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/shiftdown_f2/exp_context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/shiftdown_f2/exp_context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/shiftdown_f2/exp_context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/shiftdown_f2/exp_context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[D]
>+[E]
>+[F]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[D1]
>+[E1]
>+[F1]
>+[r]
>+[s]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/addition_shift_f3_misplaced/context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/addition_shift_f3_misplaced/context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/addition_shift_f3_misplaced/context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/addition_shift_f3_misplaced/context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[d]
>+[e]
>+[f]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[M]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/deletion_shift_f3_missplaced/context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/deletion_shift_f3_missplaced/context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/deletion_shift_f3_missplaced/context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/deletion_shift_f3_missplaced/context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[M]
>+[e]
>+[f]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[M]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/2hunks_shift_autofuzz-1/exp_context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/2hunks_shift_autofuzz-1/exp_context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/2hunks_shift_autofuzz-1/exp_context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/2hunks_shift_autofuzz-1/exp_context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,25 @@
>+[a]
>+[b]
>+[c]
>+[d]
>+[E1]
>+[F1]
>+[F2]
>+[F3]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[o]
>+[p]
>+[Q1]
>+[R1]
>+[S1]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/2hunks_shift_autofuzz-1/context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/2hunks_shift_autofuzz-1/context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/2hunks_shift_autofuzz-1/context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/2hunks_shift_autofuzz-1/context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[d]
>+[E]
>+[F]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[o]
>+[p]
>+[Q]
>+[R]
>+[S]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_begin/exp_context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_begin/exp_context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_begin/exp_context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_begin/exp_context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[A1]
>+[B1]
>+[c]
>+[d]
>+[e]
>+[f]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/shift_correct/context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/shift_correct/context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/shift_correct/context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/shift_correct/context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[D]
>+[e]
>+[f]
>+[g]
>+[h]
>+[i]
>+[c]
>+[D]
>+[e]
>+[m]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[c]
>+[D]
>+[e]
>Index: src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_begin/context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_begin/context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_begin/context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_begin/context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[A]
>+[B]
>+[c]
>+[d]
>+[e]
>+[f]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_end/exp_context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_end/exp_context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_end/exp_context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_end/exp_context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[d]
>+[e]
>+[f]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[u]
>+[V1]
>+[W1]
>Index: src/org/eclipse/compare/tests/patchdata/addition_autofuzz-f2/context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/addition_autofuzz-f2/context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/addition_autofuzz-f2/context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/addition_autofuzz-f2/context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[d]
>+[e]
>+[f]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[M]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f2/context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f2/context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f2/context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f2/context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[D]
>+[E]
>+[F]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[o]
>+[p]
>+[Q]
>+[R]
>+[S]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/2hunks_switch_fail/context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/2hunks_switch_fail/context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/2hunks_switch_fail/context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/2hunks_switch_fail/context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[D]
>+[E]
>+[F]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[U]
>+[V]
>+[W]
>Index: src/org/eclipse/compare/tests/patchdata/autofuzz-f1/exp_context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/autofuzz-f1/exp_context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/autofuzz-f1/exp_context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/autofuzz-f1/exp_context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[d1]
>+[e1]
>+[f1]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f1-f0/exp_context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f1-f0/exp_context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f1-f0/exp_context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f1-f0/exp_context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[D1]
>+[E1]
>+[F1]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[o]
>+[p]
>+[Q1]
>+[R1]
>+[S1]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f1-f0/context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f1-f0/context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f1-f0/context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f1-f0/context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[D]
>+[E]
>+[F]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[o]
>+[p]
>+[Q]
>+[R]
>+[S]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/autofuzz-f1/context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/autofuzz-f1/context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/autofuzz-f1/context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/autofuzz-f1/context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[d]
>+[e]
>+[f]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[u]
>+[v]
>+[w]
>Index: src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f1-f0/patch.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f1-f0/patch.txt
>diff -N src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f1-f0/patch.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f1-f0/patch.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,30 @@
>+#
>+diff -u -N context.txt context.txt
>+--- context.txt	2007-06-27 08:50:46.000000603 -0400
>++++ context.txt	2007-07-11 17:24:45.000000000 -0400
>+@@ -1,3 +1,3 @@
>+ [Xa]
>+ [b]
>+ [c]
>+-[D]
>+-[E]
>+-[F]
>++[D1]
>++[E1]
>++[F1]
>+ [g]
>+ [h]
>+ [Xi]
>+@@ -14,3 +14,3 @@
>+ [n]
>+ [o]
>+ [p]
>+-[Q]
>+-[R]
>+-[S]
>++[Q1]
>++[R1]
>++[S1]
>+ [t]
>+ [u]
>+ [v]
>Index: src/org/eclipse/compare/tests/patchdata/2hunks_switch_fail/exp_context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/2hunks_switch_fail/exp_context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/2hunks_switch_fail/exp_context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/2hunks_switch_fail/exp_context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[D]
>+[E]
>+[F]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[m]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[U1]
>+[V1]
>+[W1]
>Index: src/org/eclipse/compare/tests/patchdata/deletion_shift_f2/context.txt
>===================================================================
>RCS file: src/org/eclipse/compare/tests/patchdata/deletion_shift_f2/context.txt
>diff -N src/org/eclipse/compare/tests/patchdata/deletion_shift_f2/context.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/compare/tests/patchdata/deletion_shift_f2/context.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+[a]
>+[b]
>+[c]
>+[d]
>+[e]
>+[f]
>+[g]
>+[h]
>+[i]
>+[j]
>+[k]
>+[l]
>+[M]
>+[n]
>+[o]
>+[p]
>+[q]
>+[r]
>+[s]
>+[t]
>+[u]
>+[v]
>+[w]

Actions: View | Diff

Attachments on bug 199846: 79481 | 79484 | 80217 | 80218