diff options
Diffstat (limited to 'bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java')
-rw-r--r-- | bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java index c2d5264b3..c7d71a602 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java @@ -24,6 +24,8 @@ public class Patcher { private static final boolean DEBUG= false;
private static final String DEV_NULL= "/dev/null"; //$NON-NLS-1$
+
+ //private static final String MARKER_TYPE= "rejectedPatchMarker";
// diff formats
private static final int CONTEXT= 0;
@@ -789,7 +791,14 @@ public class Patcher { } else
pp= new Path(path.lastSegment() + ".rej"); //$NON-NLS-1$
file= createPath(container, pp);
- updateFile(getRejected(failed), file, pm);
+ if (file != null) {
+ updateFile(getRejected(failed), file, pm);
+// try {
+// IMarker marker= file.createMarker(MARKER_TYPE);
+// marker.setAttribute(marker.MESSAGE, "rejected patch");
+// } catch (CoreException ex) {
+// }
+ }
}
}
|