Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-05-16 19:55:09 +0000
committerMichael Valenta2002-05-16 19:55:09 +0000
commit6f559169d9da6f6154ed86545827af11e9fb8e9b (patch)
tree0295702f2847468eea519e73c084a485afeeed21 /bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui
parent90062856ee597f4ca008ad7ff3d74257bc207322 (diff)
downloadeclipse.platform.team-6f559169d9da6f6154ed86545827af11e9fb8e9b.tar.gz
eclipse.platform.team-6f559169d9da6f6154ed86545827af11e9fb8e9b.tar.xz
eclipse.platform.team-6f559169d9da6f6154ed86545827af11e9fb8e9b.zip
16198: Override and Commit fails on incomming addition
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui')
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncSet.java16
1 files changed, 9 insertions, 7 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncSet.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncSet.java
index 80a6568ad..9b13e0632 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncSet.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncSet.java
@@ -65,13 +65,15 @@ public class CVSSyncSet extends SyncSet {
try {
ITeamNode node = (ITeamNode)it.next();
ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(node.getResource());
- if(cvsResource.isFolder()) {
- if(!((ICVSFolder)cvsResource).isCVSFolder()) {
- it.remove();
- }
- } else {
- if(!cvsResource.isManaged()) {
- it.remove();
+ if (cvsResource.exists()) {
+ if(cvsResource.isFolder()) {
+ if(!((ICVSFolder)cvsResource).isCVSFolder()) {
+ it.remove();
+ }
+ } else {
+ if(!cvsResource.isManaged()) {
+ it.remove();
+ }
}
}
} catch (CVSException e) {

Back to the top