Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2002-01-24 15:56:50 +0000
committerJean Michel-Lemieux2002-01-24 15:56:50 +0000
commit53e51907e39ca601dbed7f7f4e34cf51ae621743 (patch)
tree2fb28645883b500c2f6b6e15720f5d0902fa92aa
parent95e1c82dfcd89eef7852f44ce52a1dbc63a7474a (diff)
downloadeclipse.platform.team-53e51907e39ca601dbed7f7f4e34cf51ae621743.tar.gz
eclipse.platform.team-53e51907e39ca601dbed7f7f4e34cf51ae621743.tar.xz
eclipse.platform.team-53e51907e39ca601dbed7f7f4e34cf51ae621743.zip
Have to remove tag option from local options when running update after receiving the
'notag' exception.
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/RemoteFolderTreeBuilder.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/RemoteFolderTreeBuilder.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/RemoteFolderTreeBuilder.java
index a3b0895f9..ee23f073f 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/RemoteFolderTreeBuilder.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/RemoteFolderTreeBuilder.java
@@ -96,6 +96,13 @@ public class RemoteFolderTreeBuilder {
updateLocalOptions = (LocalOption[])localOptions.toArray(new LocalOption[localOptions.size()]);
}
+ private LocalOption[] getOptionsWithoutTag() {
+ // Build the local options
+ List localOptions = new ArrayList();
+ localOptions.add(Update.RETRIEVE_ABSENT_DIRECTORIES);
+ return (LocalOption[])localOptions.toArray(new LocalOption[localOptions.size()]);
+ }
+
public static RemoteFolderTree buildBaseTree(CVSRepositoryLocation repository, ICVSFolder root, CVSTag tag, IProgressMonitor monitor) throws CVSException {
RemoteFolderTreeBuilder builder = new RemoteFolderTreeBuilder(repository, root, tag);
return builder.buildBaseTree(null, root, monitor);
@@ -418,7 +425,7 @@ public class RemoteFolderTreeBuilder {
Policy.checkCanceled(monitor);
status = Command.UPDATE.execute(session,
new GlobalOption[] { Command.DO_NOT_CHANGE },
- updateLocalOptions,
+ getOptionsWithoutTag(),
new String[] { localPath.toString() },
new UpdateListener(listener),
monitor);

Back to the top