Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2004-04-23 13:18:17 -0400
committerMichael Valenta2004-04-23 13:18:17 -0400
commit039679b4502912e305fa7d986dfedf88220ed539 (patch)
treecb2c68dbdbab77a6dbfdf1090f969eb6a0ea00e9
parentd76da4e98a9905b91dd32a5d93d6d5605ab9d276 (diff)
downloadeclipse.platform.team-039679b4502912e305fa7d986dfedf88220ed539.tar.gz
eclipse.platform.team-039679b4502912e305fa7d986dfedf88220ed539.tar.xz
eclipse.platform.team-039679b4502912e305fa7d986dfedf88220ed539.zip
58764: Unable to check out files to an exisitng project
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ResponseHandler.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ResponseHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ResponseHandler.java
index 8e99fc8ce..2b9deb60f 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ResponseHandler.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ResponseHandler.java
@@ -68,8 +68,11 @@ public abstract class ResponseHandler {
String repositoryDir) throws CVSException {
ICVSFolder folder = session.getLocalRoot().getFolder(localDir);
- if (!CVSProviderPlugin.getPlugin().getPruneEmptyDirectories() && !folder.exists()) {
- // Only create the folder if prunign is disabled.
+ if (!folder.exists()
+ && (!CVSProviderPlugin.getPlugin().getPruneEmptyDirectories()
+ || !folder.getParent().isCVSFolder())) {
+ // Only create the folder if pruning is disabled or the
+ // folder's parent is not a CVS folder (which occurs on checkout).
// When pruning is enabled, the folder will be lazily created
// when it contains a file (see getExistingFolder)
folder.mkdir();

Back to the top