### Eclipse Workspace Patch 1.0 #P org.eclipse.team.cvs.core Index: src/org/eclipse/team/internal/ccvs/core/CVSMessages.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMessages.java,v retrieving revision 1.20 diff -u -r1.20 CVSMessages.java --- src/org/eclipse/team/internal/ccvs/core/CVSMessages.java 11 Apr 2011 10:11:36 -0000 1.20 +++ src/org/eclipse/team/internal/ccvs/core/CVSMessages.java 12 Apr 2011 08:22:24 -0000 @@ -261,6 +261,7 @@ public static String ThePatchDoesNotContainChangesFor_0; public static String ThePatchDoesNotContainAllTheChanges; public static String ThePatchMayNotContainAllTheChanges; + public static String ErrorsOccurredWhileCreatingThePatch; static { // load message values from bundle file Index: src/org/eclipse/team/internal/ccvs/core/messages.properties =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties,v retrieving revision 1.176 diff -u -r1.176 messages.properties --- src/org/eclipse/team/internal/ccvs/core/messages.properties 11 Apr 2011 10:11:36 -0000 1.176 +++ src/org/eclipse/team/internal/ccvs/core/messages.properties 12 Apr 2011 08:22:24 -0000 @@ -264,4 +264,5 @@ PrepareForReplaceVisitor_FileCannotBeReplacedWithBase=File {0} cannot be replaced with BASE. ThePatchDoesNotContainChangesFor_0= The patch does not contain changes for {0} ThePatchDoesNotContainAllTheChanges=The patch does not contain all the changes -ThePatchMayNotContainAllTheChanges=The patch may not contain all the changes \ No newline at end of file +ThePatchMayNotContainAllTheChanges=The patch may not contain all the changes +ErrorsOccurredWhileCreatingThePatch = Errors occurred while creating the patch \ No newline at end of file #P org.eclipse.team.cvs.ui Index: src/org/eclipse/team/internal/ccvs/ui/operations/DiffOperation.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/DiffOperation.java,v retrieving revision 1.20 diff -u -r1.20 DiffOperation.java --- src/org/eclipse/team/internal/ccvs/ui/operations/DiffOperation.java 23 Mar 2011 14:07:54 -0000 1.20 +++ src/org/eclipse/team/internal/ccvs/ui/operations/DiffOperation.java 12 Apr 2011 08:22:26 -0000 @@ -328,8 +328,8 @@ : CVSMessages.ThePatchDoesNotContainAllTheChanges; status = new MultiStatus(CVSProviderPlugin.ID, CVSStatus.SERVER_ERROR, - (IStatus[]) toShow.toArray(new IStatus[0]), msg, null); - CVSUIPlugin.openError(getShell(), null, null, status, + (IStatus[]) toShow.toArray(new IStatus[0]), CVSMessages.ErrorsOccurredWhileCreatingThePatch, null); + CVSUIPlugin.openError(getShell(), this.getTaskName(), msg, status, CVSUIPlugin.PERFORM_SYNC_EXEC | CVSUIPlugin.LOG_OTHER_EXCEPTIONS); }