Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2004-05-12 19:22:07 +0000
committerMichael Valenta2004-05-12 19:22:07 +0000
commiteddedc479bb02dbe8f596532925ff2c0d43d5e8b (patch)
tree47717f8c6c4c274b4ac260bd3f5c7ac16ced8633
parent0982eb5a4011ff0fe6c027173dde856c44a0eefb (diff)
downloadeclipse.platform.team-eddedc479bb02dbe8f596532925ff2c0d43d5e8b.tar.gz
eclipse.platform.team-eddedc479bb02dbe8f596532925ff2c0d43d5e8b.tar.xz
eclipse.platform.team-eddedc479bb02dbe8f596532925ff2c0d43d5e8b.zip
Bug 57002: Branching with incoming changes
Bug 53399: [CVS Sync View] branching doesn't cause label updates in the sync view
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSWorkspaceSubscriber.java17
1 files changed, 17 insertions, 0 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSWorkspaceSubscriber.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSWorkspaceSubscriber.java
index 9bad387b6..6133418d5 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSWorkspaceSubscriber.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSWorkspaceSubscriber.java
@@ -12,6 +12,7 @@ package org.eclipse.team.internal.ccvs.core;
import java.util.ArrayList;
import java.util.List;
+
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
@@ -34,8 +35,10 @@ import org.eclipse.team.core.variants.IResourceVariant;
import org.eclipse.team.core.variants.IResourceVariantTree;
import org.eclipse.team.core.variants.PersistantResourceVariantByteStore;
import org.eclipse.team.core.variants.ResourceVariantByteStore;
+import org.eclipse.team.internal.ccvs.core.connection.CVSRepositoryLocation;
import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
import org.eclipse.team.internal.ccvs.core.resources.EclipseSynchronizer;
+import org.eclipse.team.internal.ccvs.core.resources.RemoteFolderTreeBuilder;
import org.eclipse.team.internal.ccvs.core.syncinfo.CVSBaseResourceVariantTree;
import org.eclipse.team.internal.ccvs.core.syncinfo.CVSDescendantResourceVariantByteStore;
import org.eclipse.team.internal.ccvs.core.syncinfo.CVSResourceVariantTree;
@@ -247,4 +250,18 @@ public class CVSWorkspaceSubscriber extends CVSSyncTreeSubscriber implements IRe
return (CVSDescendantResourceVariantByteStore)((CVSResourceVariantTree)getRemoteTree()).getByteStore();
}
+ /**
+ * Update the remote tree to the base
+ */
+ public void updateRemote(CVSTeamProvider provider, IProgressMonitor monitor) throws TeamException {
+ monitor.beginTask(null, 100);
+ ICVSResource tree = RemoteFolderTreeBuilder.buildBaseTree(
+ (CVSRepositoryLocation)provider.getRemoteLocation(),
+ provider.getCVSWorkspaceRoot().getLocalRoot(),
+ null,
+ Policy.subMonitorFor(monitor, 50));
+ setRemote(provider.getProject(), (IResourceVariant)tree, Policy.subMonitorFor(monitor, 50));
+ monitor.done();
+ }
+
}

Back to the top