Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-06-07 16:13:53 +0000
committerMichael Valenta2002-06-07 16:13:53 +0000
commitc462484a49ebe26312eacdd763b8b5642f130e55 (patch)
treea73cd7df140f689d53f194a4a53a6cf21f351803 /bundles
parent335747087c1d76b394d838eec415313301dd2cd5 (diff)
downloadeclipse.platform.team-c462484a49ebe26312eacdd763b8b5642f130e55.tar.gz
eclipse.platform.team-c462484a49ebe26312eacdd763b8b5642f130e55.tar.xz
eclipse.platform.team-c462484a49ebe26312eacdd763b8b5642f130e55.zip
19107: CVS Sync: Prompted to Add on Override and Commit of incoming addition
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncSet.java10
1 files changed, 6 insertions, 4 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 fc908a0ef..ee7ba8330 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
@@ -53,12 +53,14 @@ public class CVSSyncSet extends SyncSet {
for (Iterator it = getSyncSet().iterator(); it.hasNext();) {
ITeamNode node = (ITeamNode)it.next();
ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(node.getResource());
- if (cvsResource.isFolder()) {
- if (!((ICVSFolder)cvsResource).isCVSFolder()) {
+ if (cvsResource.exists()) {
+ if (cvsResource.isFolder()) {
+ if (!((ICVSFolder)cvsResource).isCVSFolder()) {
+ return true;
+ }
+ } else if (!cvsResource.isManaged()) {
return true;
}
- } else if (!cvsResource.isManaged()) {
- return true;
}
}
return false;

Back to the top