Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-02-12 08:54:05 -0500
committerMichael Valenta2002-02-12 08:54:05 -0500
commita3f2d90990a619c5d692f4c798a9f3299a7a85bd (patch)
tree552e42d9c7803157982ec88014d1fa0f77918eff
parent1f7f0d8ff57cd9cb30dc67cbdea44a76745de6e0 (diff)
downloadeclipse.platform.team-a3f2d90990a619c5d692f4c798a9f3299a7a85bd.tar.gz
eclipse.platform.team-a3f2d90990a619c5d692f4c798a9f3299a7a85bd.tar.xz
eclipse.platform.team-a3f2d90990a619c5d692f4c798a9f3299a7a85bd.zip
Fixed bug involving traversal into unmanaged children that are CVS folders
when building the base tree
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/RemoteFolderTreeBuilder.java7
1 files changed, 5 insertions, 2 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 5c1f78f3f..ff9aa5657 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
@@ -183,14 +183,17 @@ public class RemoteFolderTreeBuilder {
// Create a remote folder tree corresponding to the local resource
RemoteFolderTree remote = new RemoteFolderTree(parent, repository, new Path(local.getFolderSyncInfo().getRepository()), local.getFolderSyncInfo().getTag());
-
+ // Above should be replaces by the following (after M3)
+// RemoteFolderTree remote = new RemoteFolderTree(parent, local.getName(), repository, new Path(local.getFolderSyncInfo().getRepository()), local.getFolderSyncInfo().getTag());
+
+
// Create a List to contain the created children
List children = new ArrayList();
// Build the child folders corresponding to local folders base
ICVSFolder[] folders = local.getFolders();
for (int i=0;i<folders.length;i++) {
- if (folders[i].isCVSFolder()) {
+ if (folders[i].isManaged() && folders[i].isCVSFolder()) {
children.add(buildBaseTree(remote, folders[i], monitor));
}
}

Back to the top