From f2b85cb1f058c4b0c740aaa1141cd23407b0fcdb Mon Sep 17 00:00:00 2001
From: Michael Valenta
Date: Thu, 14 Aug 2003 17:53:51 +0000
Subject: *** empty log message ***

---
 .../team/internal/ccvs/ui/operations/SingleCommandOperation.java       | 3 ++-
 .../team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/SingleCommandOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/SingleCommandOperation.java
index adbe49e8a..4ee9d2e0f 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/SingleCommandOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/SingleCommandOperation.java
@@ -15,6 +15,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.team.internal.ccvs.core.CVSException;
+import org.eclipse.team.internal.ccvs.core.CVSStatus;
 import org.eclipse.team.internal.ccvs.core.CVSTeamProvider;
 import org.eclipse.team.internal.ccvs.core.client.Command;
 import org.eclipse.team.internal.ccvs.core.client.Session;
@@ -41,7 +42,7 @@ public abstract class SingleCommandOperation extends RepositoryProviderOperation
 		session.open(Policy.subMonitorFor(monitor, 10));
 		try {
 			IStatus status = executeCommand(session, provider, resources, Policy.subMonitorFor(monitor, 90));
-			if (!status.isOK()) {
+			if (status.getCode() == CVSStatus.SERVER_ERROR) {
 				addError(status);
 			}
 		} finally {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java
index e8fff0314..a869a107a 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java
@@ -53,6 +53,7 @@ public class UpdateOnlyMergableOperation extends SingleCommandOperation {
 			Policy.subMonitorFor(monitor, 90));
 		if (status.getCode() != IStatus.ERROR) {
 			addSkippedFiles(update.getSkippedFiles());
+			return OK;
 		} 
 		return status;
 	}
-- 
cgit v1.2.3