Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2003-07-16 15:01:19 +0000
committerMichael Valenta2003-07-16 15:01:19 +0000
commit851e2538651f49b97c90607c9e887668ba34012d (patch)
tree4f4a44785e57c7e678c257891374d28b1277961c
parent15ea6fce26008c82b80b1e54fa259a781c6c115a (diff)
downloadeclipse.platform.team-851e2538651f49b97c90607c9e887668ba34012d.tar.gz
eclipse.platform.team-851e2538651f49b97c90607c9e887668ba34012d.tar.xz
eclipse.platform.team-851e2538651f49b97c90607c9e887668ba34012d.zip
40221: [Live Sync View] Conflicting deletion not cleared
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/FileStructureVisitor.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/SyncUpdate.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/FileStructureVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/FileStructureVisitor.java
index b751c8043..87cd60822 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/FileStructureVisitor.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/FileStructureVisitor.java
@@ -33,7 +33,7 @@ class FileStructureVisitor extends AbstractStructureVisitor {
private boolean sendEmptyFolders;
public FileStructureVisitor(Session session, boolean sendEmptyFolders, boolean sendModifiedContents, IProgressMonitor monitor) {
- this(session, true, sendModifiedContents, true, monitor);
+ this(session, sendEmptyFolders, sendModifiedContents, true, monitor);
}
public FileStructureVisitor(Session session, boolean sendEmptyFolders, boolean sendModifiedContents, boolean sendBinary, IProgressMonitor monitor) {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/SyncUpdate.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/SyncUpdate.java
index a42791c50..f0020f106 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/SyncUpdate.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/SyncUpdate.java
@@ -25,7 +25,7 @@ public class SyncUpdate extends Update {
boolean emptyFolders, IProgressMonitor monitor) throws CVSException {
checkResourcesManaged(resources);
- new FileStructureVisitor(session, false, true, false, monitor).visit(session, resources);
+ new FileStructureVisitor(session, emptyFolders, true, false, monitor).visit(session, resources);
}
}

Back to the top