From ea536e071c2cfd187c45a88dc2907eff1582b5c1 Mon Sep 17 00:00:00 2001
From: Michael Valenta
Date: Fri, 5 Apr 2002 17:23:56 +0000
Subject: 12369: "Error setting nature org.eclipse.team.cvs.core.cvsnature"

---
 .../src/org/eclipse/team/internal/ccvs/core/CVSProvider.java       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProvider.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProvider.java
index 12734728d..e85236e9b 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProvider.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProvider.java
@@ -21,6 +21,7 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
+import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
@@ -136,12 +137,14 @@ public class CVSProvider implements ICVSProvider {
 					// should be removed once nature support is added to the UI.
 					// delete children, keep project 
 					monitor.subTask(Policy.bind("CVSProvider.Scrubbing_local_project_1")); //$NON-NLS-1$
-					IResource[] children = project.members();
+					IResource[] children = project.members(IContainer.INCLUDE_TEAM_PRIVATE_MEMBERS);
 					IProgressMonitor subMonitor = Policy.subMonitorFor(monitor, 80);
 					subMonitor.beginTask(null, children.length * 100);
 					try {
 						for (int j = 0; j < children.length; j++) {
-							children[j].delete(true /*force*/, Policy.subMonitorFor(subMonitor, 100));
+							if ( ! children[j].getName().equals(".project")) {
+								children[j].delete(true /*force*/, Policy.subMonitorFor(subMonitor, 100));
+							}
 						}
 					} finally {
 						subMonitor.done();
-- 
cgit v1.2.3