*** empty log message ***

17 files changed, 158 insertions, 157 deletions

diff --git a/bundles/org.eclipse.team.cvs.core/plugin.xml b/bundles/org.eclipse.team.cvs.core/plugin.xml
index 2663ecc81..5a4aaf4c0 100644
--- a/bundles/org.eclipse.team.cvs.core/plugin.xml
+++ b/bundles/org.eclipse.team.cvs.core/plugin.xml
@@ -1,133 +1,88 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin
-   id="org.eclipse.team.cvs.core"
-   name="%pluginName"
-   version="2.0.0"
-   provider-name="%providerName"
-   class="org.eclipse.team.internal.ccvs.core.CVSProviderPlugin">
+	name="%pluginName"
+	id="org.eclipse.team.cvs.core"
+	version="2.0.0"
+    provider-name="%providerName"
+	class="org.eclipse.team.internal.ccvs.core.CVSProviderPlugin">
 
-   <runtime>
-      <library name="cvs.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.team.core"/>
-      <import plugin="org.apache.xerces"/>
-   </requires>
+	<requires>
+		<import plugin="org.eclipse.core.resources"/>
+		<import plugin="org.eclipse.team.core"/>
+		<import plugin="org.apache.xerces"/>
+	</requires>
 
+	<runtime>
+		<library name="cvs.jar">
+			<export name="*"/>
+		</library>
+	</runtime>
 
-<!-- *************** Extension Points **************** -->
-   <extension-point id="authenticator" name="Authenticator"/>
-   <extension-point id="connectionmethods" name="ConnectionMethods"/>
+	<!-- *************** Extension Points **************** -->
+	<extension-point name="Authenticator" id="authenticator"/>
+	<extension-point name="ConnectionMethods" id="connectionmethods"/>
 
-<!-- *************** Connection Methods **************** -->
-   <extension
-         id="pserver"
-         point="org.eclipse.team.cvs.core.connectionmethods">
-      <adapter>
-         <run
-               class="org.eclipse.team.internal.ccvs.core.connection.PServerConnectionMethod">
-            <parameter
-                  name="trace"
-                  value="false">
-            </parameter>
-         </run>
-      </adapter>
-   </extension>
-   <extension
-         id="ext"
-         point="org.eclipse.team.cvs.core.connectionmethods">
-      <adapter>
-         <run
-               class="org.eclipse.team.internal.ccvs.core.connection.ExtConnectionMethod">
-            <parameter
-                  name="trace"
-                  value="false">
-            </parameter>
-         </run>
-      </adapter>
-   </extension>
-<!-- *************** Project Nature **************** -->
-   <extension
-         id="cvsnature"
-         name="%cvsNature"
-         point="org.eclipse.core.resources.natures">
-      <runtime>
-         <run
-               class="org.eclipse.team.internal.ccvs.core.CVSTeamProvider">
-         </run>
-      </runtime>
-      <one-of-nature
-            id="org.eclipse.team.repository-provider">
-      </one-of-nature>
-   </extension>
-<!-- *************** Repository Provider **************** -->
-   <extension
+	<!-- *************** Connection Methods **************** -->
+	<extension id="pserver" point="org.eclipse.team.cvs.core.connectionmethods">
+		<adapter>
+			<run class="org.eclipse.team.internal.ccvs.core.connection.PServerConnectionMethod">
+				<parameter name="trace" value="false" /> 
+			</run>
+		</adapter>
+	</extension>
+	
+	<extension id="ext" point="org.eclipse.team.cvs.core.connectionmethods">
+		<adapter>
+			<run class="org.eclipse.team.internal.ccvs.core.connection.ExtConnectionMethod">
+				<parameter name="trace" value="false" /> 
+			</run>
+		</adapter>
+	</extension>
+
+	<!-- *************** Repository Provider **************** -->
+	<extension
          point="org.eclipse.team.core.repository">
       <repository
             class="org.eclipse.team.internal.ccvs.core.CVSTeamProvider"
             id="org.eclipse.team.cvs.core.cvsnature">
       </repository>
-   </extension>
-<!-- *************** Resource patterns ignored by CVS **************** -->
-   <extension
-         point="org.eclipse.team.core.ignore">
-      <ignore
-            selected="true"
-            pattern=".#*">
-      </ignore>
-   </extension>
-<!-- *************** Markers **************** -->
-   <extension
-         id="cvsmarker"
-         point="org.eclipse.core.resources.markers">
-   </extension>
-   <extension
-         id="vcmmeta"
-         name="%vcmMetaMarker"
-         point="org.eclipse.core.resources.markers">
-      <super
-            type="org.eclipse.core.resources.problemmarker">
-      </super>
-      <super
-            type="org.eclipse.team.cvs.core.cvsmarker">
-      </super>
-      <persistent
-            value="true">
-      </persistent>
-   </extension>
-   <extension
-         id="cvsremove"
-         name="CVS Remove"
-         point="org.eclipse.core.resources.markers">
-      <super
-            type="org.eclipse.core.resources.problemmarker">
-      </super>
-      <super
-            type="org.eclipse.team.cvs.core.cvsmarker">
-      </super>
-      <attribute
-            name="name">
-      </attribute>
-      <persistent
-            value="true">
-      </persistent>
-   </extension>
-   <extension
-         id="cvsadd"
-         name="CVS Add"
-         point="org.eclipse.core.resources.markers">
-      <super
-            type="org.eclipse.core.resources.problemmarker">
-      </super>
-      <super
-            type="org.eclipse.team.cvs.core.cvsmarker">
-      </super>
-      <persistent
-            value="true">
-      </persistent>
-   </extension>
+	</extension>
+   
+	<!-- *************** Project Nature **************** -->
+	<extension point="org.eclipse.core.resources.natures" id="cvsnature" name="%cvsNature">
+		<runtime>
+			<run class="org.eclipse.team.internal.ccvs.core.CVSTeamProvider"/>
+		</runtime>
+		<one-of-nature id="org.eclipse.team.repository-provider"/>
+	</extension>
+ 
+ 	<!-- *************** Resource patterns ignored by CVS **************** -->
+ 	<extension point="org.eclipse.team.core.ignore">
+		<ignore pattern = ".#*" selected = "true"/>
+	</extension>
+ 
+  	<!-- *************** Markers **************** -->
+	<extension id="cvsmarker" point="org.eclipse.core.resources.markers"/>
+	<extension id="vcmmeta" point="org.eclipse.core.resources.markers" name="%vcmMetaMarker">
+		<super type="org.eclipse.core.resources.problemmarker"/>
+		<super type="org.eclipse.team.cvs.core.cvsmarker"/>
+		<persistent value="true"/>
+	</extension>
+	<extension id="cvsremove" point="org.eclipse.core.resources.markers" name="CVS Remove">
+		<super type="org.eclipse.core.resources.problemmarker"/>
+		<super type="org.eclipse.team.cvs.core.cvsmarker"/>
+		<attribute name="name"/>
+		<persistent value="true"/>
+	</extension>
+	<extension id="cvsadd" point="org.eclipse.core.resources.markers" name="CVS Add">
+		<super type="org.eclipse.core.resources.problemmarker"/>
+		<super type="org.eclipse.team.cvs.core.cvsmarker"/>
+		<persistent value="true"/>
+	</extension>
+	
+	<!-- ************ File Types *************** -->
+	<extension point="org.eclipse.team.core.fileTypes">
+		<fileTypes extension="cvsignore" type="text"/>
+	</extension>
 
-</plugin>
+</plugin>
\ No newline at end of file
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSException.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSException.java
index 14a42b3e1..8f05aba39 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSException.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSException.java
@@ -76,6 +76,11 @@ public class CVSException extends TeamException {
 	
 	public static CVSException wrapException(CoreException e) {
 		IStatus status = e.getStatus();
-		return new CVSException(new CVSStatus(status.getSeverity(), status.getCode(), status.getMessage(), e));
+		// If the exception is not a multi-status, wrap the exception to keep the original stack trace.
+		// If the exception is a maulit-status, the interesting stack traces should eb in the childen already
+		if ( ! status.isMultiStatus()) {
+			status = new CVSStatus(status.getSeverity(), status.getCode(), status.getMessage(), e);
+		}
+		return new CVSException(status);
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java
index deb53a38a..7a1607b25 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java
@@ -418,7 +418,7 @@ public class CVSTeamProvider extends RepositoryProvider {
 	}
 	
 	/** 
-	 * Diff the resources against the repository and write the output to the provided 
+	 * Diff the resources with the repository and write the output to the provided 
 	 * PrintStream in a form that is usable as a patch. The patch is rooted at the
 	 * project.
 	 */
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSWorkspaceRoot.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSWorkspaceRoot.java
index a87f732b2..5425b54fe 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSWorkspaceRoot.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSWorkspaceRoot.java
@@ -138,7 +138,7 @@ public class CVSWorkspaceRoot {
 	}
 	
 	/**
-	 * Sync the given unshared project against the given repository and module.
+	 * Sync the given unshared project with the given repository and module.
 	 */
 	public static IRemoteSyncElement getRemoteSyncTree(IProject project, ICVSRepositoryLocation location, String moduleName, CVSTag tag, IProgressMonitor progress) throws TeamException {
 		if (CVSWorkspaceRoot.getCVSFolderFor(project).isCVSFolder()) {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java
index 5c0cab35f..3eb694058 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java
@@ -107,10 +107,10 @@ public class EclipseFile extends EclipseResource implements ICVSFile {
 	 * @see ICVSFile#isModified()
 	 */
 	public boolean isModified() throws CVSException {
-		if (!exists() || !isManaged()) {
+		ResourceSyncInfo info = getSyncInfo();
+		if (!exists() || !isManaged(info)) {
 			return true;
 		} else {
-			ResourceSyncInfo info = getSyncInfo();
 			// consider a merged file as always modified.
 			if(info.isMerged()) return true;
 			return !getTimeStamp().equals(info.getTimeStamp());
@@ -211,7 +211,8 @@ public class EclipseFile extends EclipseResource implements ICVSFile {
 	 * @see ICVSFile#getLogEntries(IProgressMonitor)
 	 */
 	public ILogEntry[] getLogEntries(IProgressMonitor monitor)	throws TeamException {
-		if(isManaged() && !getSyncInfo().isAdded()) {
+		ResourceSyncInfo info = getSyncInfo();
+		if(isManaged(info) && !info.isAdded()) {
 			ICVSRemoteResource remoteFile = CVSWorkspaceRoot.getRemoteResourceFor(resource);
 			return ((ICVSRemoteFile)remoteFile).getLogEntries(monitor);
 		}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java
index 8898dc76b..0ee11f494 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java
@@ -143,7 +143,7 @@ abstract class EclipseResource implements ICVSResource, Comparable {
 			}
 		}
 		
-		// check against all the registered patterns
+		// check with all the registered patterns
 		boolean ignored = matcher.match(getName());
 		
 		// check the parent, if the parent is ignored then this resource
@@ -175,9 +175,16 @@ abstract class EclipseResource implements ICVSResource, Comparable {
 	 * @see ICVSResource#isManaged()
 	 */
 	public boolean isManaged() throws CVSException {
-		return getSyncInfo() != null;
+		return isManaged(getSyncInfo());
 	}
-			
+	
+	/*
+	 * Helper method that captures the sematics of isManaged given a ResourceSyncInfo
+	 */
+	public boolean isManaged(ResourceSyncInfo info) {
+		return info != null;
+	}
+	
 	/**
 	 * Two ManagedResources are equal, if there cvsResources are
 	 * equal (and that is, if the point to the same file)
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java
index ea8402668..079e3e674 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java
@@ -210,7 +210,10 @@ public class RemoteModule extends RemoteFolder {
 				boolean expandable = true;
 				for (int i = 0; i < children.length; i++) {
 					RemoteModule child = (RemoteModule)modules.get(children[i].substring(1));
-					if (child.isAlias()) {
+					if (child == null) {
+						// invalid module definition
+						expandable = false;
+					} else if (child.isAlias()) {
 						// Include alias children in-line
 						expandable = false;
 //						referencedFolders.addAll(Arrays.asList(child.getChildren()));
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java
index a425cd92d..bbd539ea3 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java
@@ -66,21 +66,26 @@ public class PrepareForReplaceVisitor implements ICVSResourceVisitor {
 	 * @see ICVSResourceVisitor#visitFolder(ICVSFolder)
 	 */
 	public void visitFolder(ICVSFolder folder) throws CVSException {
-		// Visit the children of the folder as appropriate
-		if (depth == IResource.DEPTH_INFINITE) {
-			folder.acceptChildren(this);
-		} else if (depth == IResource.DEPTH_ONE) {
-			ICVSResource[] files = folder.members(ICVSFolder.FILE_MEMBERS);
-			for (int i = 0; i < files.length; i++) {
-				files[i].accept(this);
+		// Delete unmanaged folders if the user wants them deleted
+		if (!folder.isCVSFolder() && CVSProviderPlugin.getPlugin().isReplaceUnmanaged()) {
+			folder.delete();
+		} else {
+			// Visit the children of the folder as appropriate
+			if (depth == IResource.DEPTH_INFINITE) {
+				folder.acceptChildren(this);
+			} else if (depth == IResource.DEPTH_ONE) {
+				ICVSResource[] files = folder.members(ICVSFolder.FILE_MEMBERS);
+				for (int i = 0; i < files.length; i++) {
+					files[i].accept(this);
+				}
 			}
-		}
-		// Also delete ignored child files that start with .#
-		ICVSResource[] ignoredFiles = folder.members(ICVSFolder.FILE_MEMBERS | ICVSFolder.IGNORED_MEMBERS);
-		for (int i = 0; i < ignoredFiles.length; i++) {
-			ICVSResource cvsResource = ignoredFiles[i];
-			if (cvsResource.getName().startsWith(".#")) { //$NON-NLS-1$
-				cvsResource.delete();
+			// Also delete ignored child files that start with .#
+			ICVSResource[] ignoredFiles = folder.members(ICVSFolder.FILE_MEMBERS | ICVSFolder.IGNORED_MEMBERS);
+			for (int i = 0; i < ignoredFiles.length; i++) {
+				ICVSResource cvsResource = ignoredFiles[i];
+				if (cvsResource.getName().startsWith(".#")) { //$NON-NLS-1$
+					cvsResource.delete();
+				}
 			}
 		}
 		monitor.worked(1);
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/StringMatcher.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/StringMatcher.java
index b6c84ef2d..59fdc9ed7 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/StringMatcher.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/StringMatcher.java
@@ -110,7 +110,7 @@ public class StringMatcher {
 	 * If invoking the StringMatcher with string literals in Java, don't forget
 	 * escape characters are represented by "\\".
 	 *
-	 * @param aPattern the pattern to match text against
+	 * @param aPattern the pattern to match text with
 	 * @param ignoreCase if true, case is ignored
 	 * @param ignoreWildCards if true, wild cards and their escape sequences are ignored
 	 * 		  (everything is taken literally).
diff --git a/bundles/org.eclipse.team.cvs.ui/plugin.properties b/bundles/org.eclipse.team.cvs.ui/plugin.properties
index 701ed20ad..ebeb3eb9f 100644
--- a/bundles/org.eclipse.team.cvs.ui/plugin.properties
+++ b/bundles/org.eclipse.team.cvs.ui/plugin.properties
@@ -114,7 +114,7 @@ ShowHistoryAction.label=Show in Resource &History
 ShowHistoryAction.tooltip=Show in Resource History
 
 GenerateDiff.label=Create &Patch...
-GenerateDiff.tooltip=Compare your workspace contents against the server and generate a diff file that can be used as a patch file.
+GenerateDiff.tooltip=Compare your workspace contents with the server and generate a diff file that can be used as a patch file.
 
 RefreshFromLocal.label=&Refresh from local CVS state
 RefreshFromLocal.tooltip=Refresh the workbench with changes made to CVS projects from outside the workbench.
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecorationRunnable.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecorationRunnable.java
index 98a285b00..092e7b12c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecorationRunnable.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecorationRunnable.java
@@ -232,20 +232,28 @@ public class CVSDecorationRunnable implements Runnable {
 	protected static CVSTag getTagToShow(IResource resource) throws CVSException {
 		ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource);
 		CVSTag tag = null;
+		
+		// for unmanaged resources don't show a tag since they will be added in
+		// the context of their parents tag. For managed resources only show tags
+		// if different than parent.
+		boolean managed = false;
+		
 		if(cvsResource.isFolder()) {
 			FolderSyncInfo folderInfo = ((ICVSFolder)cvsResource).getFolderSyncInfo();
 			if(folderInfo != null) {
 				tag = folderInfo.getTag();
+				managed = true;
 			}  
 		} else {
 			ResourceSyncInfo info = ((ICVSFile)cvsResource).getSyncInfo();
 			if(info != null) {
 				tag = info.getTag();
+				managed = true;
 			}
 		}
 		
 		ICVSFolder parent = cvsResource.getParent();
-		if(parent != null && tag != null) {
+		if(parent != null && managed) {
 			FolderSyncInfo parentInfo = parent.getFolderSyncInfo();
 			if(parentInfo != null) {												
 				CVSTag parentTag = parentInfo.getTag();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSRepositoryPropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSRepositoryPropertiesPage.java
index fd44cefaf..798ee732f 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSRepositoryPropertiesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSRepositoryPropertiesPage.java
@@ -252,7 +252,8 @@ public class CVSRepositoryPropertiesPage extends PropertyPage {
 								Policy.bind("CVSRepositoryPropertiesPage.There_are_projects_in_the_workspace_shared_with_this_repository_2"), //$NON-NLS-1$
 								Policy.bind("CVSRepositoryPropertiesPage.sharedProject", location.toString()), //$NON-NLS-1$
 								(IProject[]) projects.toArray(new IProject[projects.size()]),
-								true);
+								true,
+								DetailsDialogWithProjects.DLG_IMG_WARNING);
 							int r = dialog.open();
 							if (r != dialog.OK) {
 								result[0] = false;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java
index 8991904ad..c73e6e376 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java
@@ -347,7 +347,9 @@ abstract public class CVSAction extends TeamAction {
 			if (resource.getType() != IResource.PROJECT) {
 				ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource);
 				CVSTag parentTag = cvsResource.getParent().getFolderSyncInfo().getTag();
-				if (!CVSTag.equalTags(tag, parentTag)) {
+				// prompt if the tags are not equal
+				// consider BASE to be equal the parent tag since we don't make BASE sticky on replace
+				if (!CVSTag.equalTags(tag, parentTag) && !CVSTag.equalTags(tag, CVSTag.BASE)) {
 					shell.getDisplay().syncExec(new Runnable() {
 						public void run() {							
 							AvoidableMessageDialog dialog = new AvoidableMessageDialog(
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/RemoveRootAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/RemoveRootAction.java
index b9f4ea25d..7077051f8 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/RemoveRootAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/RemoveRootAction.java
@@ -102,7 +102,8 @@ public class RemoveRootAction extends TeamAction {
 										Policy.bind("RemoteRootAction.Projects_in_the_local_workspace_are_shared_with__2", location), //$NON-NLS-1$
 										Policy.bind("RemoteRootAction.The_projects_that_are_shared_with_the_above_repository_are__4"), //$NON-NLS-1$
 										(IProject[]) shared.toArray(new IProject[shared.size()]),
-										false);
+										false,
+										DetailsDialogWithProjects.DLG_IMG_ERROR);
 									dialog.open();
 								}
 							});
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
index 2a9e6b378..23c6f43e9 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
@@ -166,7 +166,7 @@ CVSPreferencePage.level2=2
 CVSPreferencePage.level3=3
 CVSPreferencePage.level4=4
 CVSPreferencePage.level5=5
-CVSPreferencePage.level6=6 (default)
+CVSPreferencePage.level6=6
 CVSPreferencePage.level7=7
 CVSPreferencePage.level8=8
 CVSPreferencePage.level9=9 (highest compression)
@@ -487,17 +487,22 @@ KSubstWizardSummaryPage.summaryViewer.ksubstHeader=Keyword Substitution Mode
 
 SharingWizard.autoConnectTitle=Connect Project to Repository
 SharingWizard.autoConnectOneOTitle=Connect Project from Eclise 1.0 to Repository
+SharingWizard.autoConnectTitleDescription=Project is already configured with CVS repository information.
 SharingWizard.couldNotImport=Remote Project Exists
 SharingWizard.couldNotImportLong=Module ''{0}'' already exists remotely. Would you like to synchronize your local project with the existing remote module?
 SharingWizard.selectTagTitle=Select Tag
 SharingWizard.selectTag=Select the tag to synchronize with:
 SharingWizard.description=Configure a Project to Use CVS
 SharingWizard.importTitle=Share Project with CVS Repository
+SharingWizard.importTitleDescription=Select an existing repository location or create a new location.
 SharingWizard.title=Share Project
 SharingWizard.heading=Configure a Project to Use CVS
 SharingWizard.enterInformation=Enter Repository Location Information
+SharingWizard.enterInformationDescription=Define the location and protocol required to connect with an existing CVS repository.
 SharingWizard.enterModuleName=Enter Module Name
+SharingWizard.enterModuleNameDescription=Select the name of the module in the CVS repository.
 SharingWizard.readyToFinish=Ready to Share Project
+SharingWizard.readyToFinishDescription=Select Finish to import the project into the CVS repository.
 SharingWizard.validationFailedText={0}. Set project sharing anyway?
 SharingWizard.validationFailedTitle=Unable to Validate
 
@@ -677,7 +682,7 @@ ConfigureTagsFromRepoViewError_retreiving_root_folders_from_repository_2=Error r
 ConfigureTagsFromRepoViewConfiguring_branch_tags_3=Configuring branch tags
 ConfigureTagsFromRepoViewOnFolderConfiguring_branch_tags_1=Configuring branch tags
 RemoteRootAction.Unable_to_Discard_Location_1=Unable to Discard Location
-RemoteRootAction.Projects_in_the_local_workspace_are_shared_with__2=Projects in the local workspace are shared with {0}
+RemoteRootAction.Projects_in_the_local_workspace_are_shared_with__2=Projects in the local workspace are shared with {0}. This location cannot be discarded until all local projects are disconnected from it.
 RemoveRootAction.removeRoot_3=RemoveRootAction.removeRoot
 RemoteRootAction.The_projects_that_are_shared_with_the_above_repository_are__4=The projects that are shared with the above repository are:
 
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncSet.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncSet.java
index fc908a0ef..ee7ba8330 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncSet.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncSet.java
@@ -53,12 +53,14 @@ public class CVSSyncSet extends SyncSet {
 		for (Iterator it = getSyncSet().iterator(); it.hasNext();) {
 			ITeamNode node = (ITeamNode)it.next();
 			ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(node.getResource());
-			if (cvsResource.isFolder()) {
-				if (!((ICVSFolder)cvsResource).isCVSFolder()) {
+			if (cvsResource.exists()) {
+				if (cvsResource.isFolder()) {
+					if (!((ICVSFolder)cvsResource).isCVSFolder()) {
+						return true;
+					}
+				} else if (!cvsResource.isManaged()) {
 					return true;
 				}
-			} else if (!cvsResource.isManaged()) {
-				return true;
 			}
 		}
 		return false;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java
index b65fd3d12..ff7f6eabf 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java
@@ -92,6 +92,7 @@ public class SharingWizard extends Wizard implements IConfigurationWizard {
 		if (doesCVSDirectoryExist()) {
 			autoconnectPage = new ConfigurationWizardAutoconnectPage("autoconnectPage", Policy.bind("SharingWizard.autoConnectTitle"), sharingImage); //$NON-NLS-1$ //$NON-NLS-2$
 			autoconnectPage.setProject(project);
+			autoconnectPage.setDescription(Policy.bind("SharingWizard.autoConnectTitleDescription"));
 			addPage(autoconnectPage);
 		} else {
 			FolderSyncInfo info = getRepositoryInfoFromOneO(project);
@@ -99,19 +100,24 @@ public class SharingWizard extends Wizard implements IConfigurationWizard {
 				// The project is from 1.0 and has sharing info
 				autoconnectPage = new ConfigurationWizardAutoconnectPage("autoconnectPage", Policy.bind("SharingWizard.autoConnectOneOTitle"), sharingImage); //$NON-NLS-1$ //$NON-NLS-2$
 				autoconnectPage.setSharing(info);
+				autoconnectPage.setDescription(Policy.bind("SharingWizard.autoConnectTitleDescription"));
 				addPage(autoconnectPage);
 			} else {
 				ICVSRepositoryLocation[] locations = CVSUIPlugin.getPlugin().getRepositoryManager().getKnownRoots();
 				if (locations.length > 0) {
 					locationPage = new RepositorySelectionPage("importPage", Policy.bind("SharingWizard.importTitle"), sharingImage); //$NON-NLS-1$ //$NON-NLS-2$
+					locationPage.setDescription(Policy.bind("SharingWizard.importTitleDescription"));
 					addPage(locationPage);
 				}
 				createLocationPage = new ConfigurationWizardMainPage("createLocationPage", Policy.bind("SharingWizard.enterInformation"), sharingImage); //$NON-NLS-1$ //$NON-NLS-2$
+				createLocationPage.setDescription(Policy.bind("SharingWizard.enterInformationDescription"));
 				addPage(createLocationPage);
 				createLocationPage.setDialogSettings(getDialogSettings());
 				modulePage = new ModuleSelectionPage("modulePage", Policy.bind("SharingWizard.enterModuleName"), sharingImage); //$NON-NLS-1$ //$NON-NLS-2$
+				modulePage.setDescription(Policy.bind("SharingWizard.enterModuleNameDescription"));
 				addPage(modulePage);
 				finishPage = new SharingWizardFinishPage("finishPage", Policy.bind("SharingWizard.readyToFinish"), sharingImage); //$NON-NLS-1$ //$NON-NLS-2$
+				finishPage.setDescription(Policy.bind("SharingWizard.readyToFinishDescription"));
 				addPage(finishPage);
 			}
 		}