bug 319661: Patch wizard excludes changes in projects that it can't connect

3 files changed, 8 insertions, 6 deletions

diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMessages.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMessages.java
index 9f42aadee..c40b729d9 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMessages.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMessages.java
@@ -258,6 +258,7 @@ public class CVSMessages extends NLS {
 	public static String CVSURI_InvalidURI;
 	public static String ThePatchDoesNotContainChangesFor_0;
 	public static String ThePatchDoesNotContainAllTheChanges;
+	public static String ThePatchMayNotContainAllTheChanges;
 
 	static {
 		// load message values from bundle file
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/DiffListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/DiffListener.java
index 0a319fd82..2a37033e0 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/DiffListener.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/DiffListener.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -74,10 +74,10 @@ public class DiffListener extends CommandOutputListener {
 			ICVSRepositoryLocation location, 
 			ICVSFolder commandRoot,
 			IProgressMonitor monitor) {
-		// ignore server messages for now - this is used only with the diff
-		// request and the errors can be safely ignored.
+		// return all the server errors as CVSStatus.ERROR_LINE or
+		// CVSStatus.PROTOCOL_ERROR
 		if (getServerMessage(line, location) != null) {
-			return OK;
+			return super.errorLine(line, location, commandRoot, monitor);
 		}
 		
 		//Check to see if this is a no such directory message
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
index 93166036d..a260c8be6 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
+# Copyright (c) 2000, 2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -261,4 +261,5 @@ LogEntry_0=/
 PrepareForReplaceVisitor_DeletedFileWithoutHistoryCannotBeRestoredWhileRevertToBase=Deleted file does not have history and cannot be restored with BASE tag.
 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
\ No newline at end of file
+ThePatchDoesNotContainAllTheChanges=The patch does not contain all the changes
+ThePatchMayNotContainAllTheChanges=The patch may not contain all the changes
\ No newline at end of file