| commit | 866f071ddb0a8ec0e23bb1475859e2a99f84f380 | [log] [tgz] |
|---|---|---|
| author | Michael Valenta <mvalenta> | Tue Apr 02 15:45:39 2002 +0000 |
| committer | Michael Valenta <mvalenta> | Tue Apr 02 15:45:39 2002 +0000 |
| tree | 1cfa4b3478a47552a5d6da23406ccfd3970f2045 | |
| parent | b377bdb1a24819de44541291dbde22a138f636a6 [diff] |
156: Load failure mode needs improvement (1GF2FWE)
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 76efb27..9e81366 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 @@ } }, 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 31aa541..1d13584 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 @@ // 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