Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-02-12 08:48:45 -0500
committerMichael Valenta2002-02-12 08:48:45 -0500
commitb8a0b259ff5280a6ecc18e9cb6253d6842a28279 (patch)
treebc72ec98957472b6afc114fc1fa4c5f6d6bca9c8
parentafda0727e75586e81dbe25eb4c6e47078237c2e0 (diff)
downloadeclipse.platform.team-b8a0b259ff5280a6ecc18e9cb6253d6842a28279.tar.gz
eclipse.platform.team-b8a0b259ff5280a6ecc18e9cb6253d6842a28279.tar.xz
eclipse.platform.team-b8a0b259ff5280a6ecc18e9cb6253d6842a28279.zip
Bug fix in makeInSync to allow update for incoming folder additions
representing folders that were deleted locally
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSRemoteSyncElement.java8
1 files changed, 2 insertions, 6 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSRemoteSyncElement.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSRemoteSyncElement.java
index be2716a0f..4e3ca4c57 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSRemoteSyncElement.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSRemoteSyncElement.java
@@ -267,14 +267,10 @@ public class CVSRemoteSyncElement extends RemoteSyncElement {
if (! local.exists()) {
local.mkdir();
} else {
- // must not be a managed folder.
- if(local.isManaged() || local.isCVSFolder()) {
+ // If the folder already has CVS info, check that the remote and local match
+ if(local.isManaged() && local.isCVSFolder() && ! remote.getFolderSyncInfo().equals(local.getFolderSyncInfo())) {
throw new CVSException(IStatus.ERROR, 0, "Error making a remote folder in sync with the server. The local folder is already managed.");
}
- // can only makesync on non-project folders, on top level folders use checkout instead.
- if(local.getParent() == null || !local.getParent().isCVSFolder()) {
- throw new CVSException(IStatus.ERROR, 0, "Error making a remote folder in sync with the server. The local folder's parent is not a cvs folder.");
- }
}
// Since the parent is managed, this will also set the resource sync info. It is

Back to the top