Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2006-01-10 17:48:25 +0000
committerMichael Valenta2006-01-10 17:48:25 +0000
commit1c4d55052edda4844eb77aa7a526cb8f66e47be9 (patch)
treeb36892a0a94141de50472b9b38b0a3012a6c2e88
parent5511570cc419e795f4be8bb22df33ef9536098b5 (diff)
downloadeclipse.platform.team-1c4d55052edda4844eb77aa7a526cb8f66e47be9.tar.gz
eclipse.platform.team-1c4d55052edda4844eb77aa7a526cb8f66e47be9.tar.xz
eclipse.platform.team-1c4d55052edda4844eb77aa7a526cb8f66e47be9.zip
Bug 123280 Update removes local delete infov20060109
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java
index 14945fa2c..0064542d5 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java
@@ -104,7 +104,7 @@ public class WorkspaceSubscriberContext extends CVSSubscriberMergeContext {
// First, verify that the provided delta matches the current state
// i.e. it is possible that a concurrent change has occurred
SyncInfo info = getSyncInfo(getDiffTree().getResource(delta));
- if (info == null || info.getKind() == SyncInfo.IN_SYNC) {
+ if (info == null || info.getKind() == SyncInfo.IN_SYNC || SyncInfo.getDirection(info.getKind()) == SyncInfo.OUTGOING) {
// Seems like this one was already merged so return OK
return Status.OK_STATUS;
}

Back to the top