1 files changed, 11 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteContentProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteContentProvider.java
index 1cbeb0d3d..4fdc69a5c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteContentProvider.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteContentProvider.java
@@ -99,9 +99,18 @@ public class RemoteContentProvider extends WorkbenchContentProvider {
 	public Object[] getChildren(Object element) {
 		if (manager != null) {
 			Object[] children = manager.getChildren(element);
-			if (children != null)
+			if (children != null) {
+				// This will be a placeholder to indicate 
+				// that the real children are being fetched
 				return children;
+			}
+		}
+		Object[] children = super.getChildren(element);
+		for (int i = 0; i < children.length; i++) {
+			Object object = children[i];
+			if (object instanceof CVSModelElement) 
+				((CVSModelElement)object).setWorkingSet(getWorkingSet());
 		}
-		return super.getChildren(element);
+		return children;
 	}
 }