Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-04-02 15:45:39 +0000
committerMichael Valenta2002-04-02 15:45:39 +0000
commit866f071ddb0a8ec0e23bb1475859e2a99f84f380 (patch)
tree1cfa4b3478a47552a5d6da23406ccfd3970f2045
parentb377bdb1a24819de44541291dbde22a138f636a6 (diff)
downloadeclipse.platform.team-866f071ddb0a8ec0e23bb1475859e2a99f84f380.tar.gz
eclipse.platform.team-866f071ddb0a8ec0e23bb1475859e2a99f84f380.tar.xz
eclipse.platform.team-866f071ddb0a8ec0e23bb1475859e2a99f84f380.zip
156: Load failure mode needs improvement (1GF2FWE)I20020402
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/AddDeleteMoveListener.java6
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java1
2 files changed, 6 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/AddDeleteMoveListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/AddDeleteMoveListener.java
index 76efb27ad..9e8136696 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/AddDeleteMoveListener.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/AddDeleteMoveListener.java
@@ -291,6 +291,12 @@ public class AddDeleteMoveListener implements IResourceDeltaVisitor, IResourceCh
}
}, Policy.monitorFor(null));
+ } else {
+ // The resource is not managed or ignored. Make sure there is an addition marker on it
+ IMarker marker = getAdditionMarker(resource);
+ if (marker == null) {
+ createAdditonMarker(resource);
+ }
}
} else if (resource.getType() == IResource.FOLDER) {
ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource);
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java
index 31aa5418b..1d1358457 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java
@@ -43,7 +43,6 @@ public class PrepareForReplaceVisitor implements ICVSResourceVisitor {
// If the file is unmanaged, just leave it as is
} else if (info.isAdded()) {
// For added files, delete and unmanage
- file.delete();
file.unmanage(null);
} else if (info.isDeleted()) {
// If deleted, null the sync info so the file will be refetched

Back to the top