41971: [CVS Sync] Strange error in log

2 files changed, 14 insertions, 2 deletions

diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
index 8a111e74a..10748d5bf 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
@@ -86,7 +86,6 @@ CVSTeamProvider.visitError=An error occurred while visiting resource {0}
 CVSTeamProvider.invalidResource=Resource {0} is not a child of project {1}
 CVSTeamProvider.checkinProblems=Problems occurred committing resources to server
 CVSTeamProvider.invalidProjectState=CVS sharing information is missing from project {0}
-CVSTeamProvider.unmanagedParent=Error retrieving remote resource tree for {0}. Parent is not managed by CVS.
 CVSTeamProvider.typesDiffer=Error retrieving remote resource tree. Local and remote resource types differ for {0}
 CVSTeamProvider.connectionInfo=Updating connection information for project {0}
 CVSTeamProvider.folderInfo=Updating folder synchronization information for project {0}
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 757aa8e77..ee19f55f0 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
@@ -511,7 +511,8 @@ public class CVSWorkspaceRoot {
 		ICVSFolder parent = managed.getParent();
 		FolderSyncInfo syncInfo = parent.getFolderSyncInfo();
 		if (syncInfo == null) {
-			throw new CVSException(new CVSStatus(CVSStatus.ERROR, Policy.bind("CVSTeamProvider.unmanagedParent", resource.getFullPath().toString()), null)); //$NON-NLS-1$
+			// The parent is managed so just indicate that there is no remote
+			return null;
 		}
 		ICVSRepositoryLocation location = CVSProviderPlugin.getPlugin().getRepository(parent.getFolderSyncInfo().getRoot());
 		RemoteFolder remoteParent = RemoteFolderTreeBuilder.buildRemoteTree((CVSRepositoryLocation)location, parent, tag, progress);
@@ -602,6 +603,18 @@ public class CVSWorkspaceRoot {
 		return getRemoteTree(resource, tag, false /* cache file contents hint */, progress);
 	}
 
+	/**
+	 * Return the remote tree that corresponds to the given local resource. Return
+	 * <code>null</code> if the remote tree doesn't exist remotely or if the local
+	 * resource is not mapped to a remote (i.e. is not managed by CVS).
+	 * 
+	 * @param resource the local resource
+	 * @param tag the tag to be queried remotely
+	 * @param cacheFileContentsHint hint which indicates whether file contents will be required
+	 * @param progress
+	 * @return the remote tree or <code>null</code>
+	 * @throws TeamException
+	 */
 	public static ICVSRemoteResource getRemoteTree(IResource resource, CVSTag tag, boolean cacheFileContentsHint, IProgressMonitor progress) throws TeamException {
 		ICVSResource managed = CVSWorkspaceRoot.getCVSResourceFor(resource);
 		ICVSRemoteResource remote = CVSWorkspaceRoot.getRemoteResourceFor(resource);