Fixed bug 386909: Apply patch seems broken with latest eclipse SDK
builds
diff --git a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java
index f4540e5..a18d93b 100644
--- a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java
+++ b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java
@@ -65,7 +65,7 @@
public static final String MULTIPROJECTPATCH_PROJECT= "#P"; //$NON-NLS-1$
- private static final Pattern GIT_PATCH_PATTERN = Pattern.compile("^diff --git a/.+ b/.+[\r\n]+$");
+ private static final Pattern GIT_PATCH_PATTERN= Pattern.compile("^diff --git a/.+ b/.+[\r\n]+$"); //$NON-NLS-1$
/**
* Create a patch reader for the default date formats.
@@ -329,6 +329,10 @@
if (line.indexOf("Index:") == 0) //$NON-NLS-1$
break;
//$FALL-THROUGH$
+ case 'd':
+ if (line.indexOf("diff ") == 0) //$NON-NLS-1$
+ break;
+ //$FALL-THROUGH$
default:
throw new IOException("Invalid patch"); //$NON-NLS-1$
}
