Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-04-04 11:52:04 -0500
committerMichael Valenta2002-04-04 11:52:04 -0500
commitac41a3f30497367d21ee8e6330e8ba613ea9d813 (patch)
treeb85cdb0c21ea63d178c972b586bacfbfb0793648
parenta0f0ef13d08cf1bb2146a0b1126ec118e6dcfa71 (diff)
downloadeclipse.platform.team-ac41a3f30497367d21ee8e6330e8ba613ea9d813.tar.gz
eclipse.platform.team-ac41a3f30497367d21ee8e6330e8ba613ea9d813.tar.xz
eclipse.platform.team-ac41a3f30497367d21ee8e6330e8ba613ea9d813.zip
8674: Get on incomming addition of empty directories fails
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java14
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/UpdateSyncAction.java5
2 files changed, 9 insertions, 10 deletions
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 8c642b579..73d739658 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
@@ -834,18 +834,14 @@ public class CVSTeamProvider extends RepositoryProvider {
* Get the arguments to be passed to a commit or update
*/
private String[] getValidArguments(IResource[] resources, LocalOption[] options) throws CVSException {
- int depth = Command.DO_NOT_RECURSE.isElementOf(options) ? IResource.DEPTH_ZERO : IResource.DEPTH_INFINITE;
List arguments = new ArrayList(resources.length);
for (int i=0;i<resources.length;i++) {
checkIsChild(resources[i]);
- // A depth of zero is only valid for files
- if ((depth != IResource.DEPTH_ZERO) || (resources[i].getType() == IResource.FILE)) {
- IPath cvsPath = resources[i].getFullPath().removeFirstSegments(1);
- if (cvsPath.segmentCount() == 0) {
- arguments.add(Session.CURRENT_LOCAL_FOLDER);
- }
- else
- arguments.add(cvsPath.toString());
+ IPath cvsPath = resources[i].getFullPath().removeFirstSegments(1);
+ if (cvsPath.segmentCount() == 0) {
+ arguments.add(Session.CURRENT_LOCAL_FOLDER);
+ } else {
+ arguments.add(cvsPath.toString());
}
}
return (String[])arguments.toArray(new String[arguments.size()]);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/UpdateSyncAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/UpdateSyncAction.java
index d41212f5f..2e61784ef 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/UpdateSyncAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/UpdateSyncAction.java
@@ -226,7 +226,10 @@ public class UpdateSyncAction extends MergeAction {
// in the case where there are multiple levels of incoming folder creations.
Iterator it = parentCreationElements.iterator();
while (it.hasNext()) {
- makeInSync((IDiffElement)it.next());
+ IDiffElement element = (IDiffElement)it.next();
+ makeInSync(element);
+ // Remove the folder from the update shallow list since we have it locally now
+ updateIgnoreLocalShallow.remove(element);
}
}
if (parentConflictElements.size() > 0) {

Back to the top