Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-05-31 21:58:13 +0000
committerMichael Valenta2002-05-31 21:58:13 +0000
commit2f3feedb3e5936b17b9777561c2fc290bfec03c7 (patch)
tree9d7e91deeac573ebe62c1afa49c724c4dba998a1
parent824c599758c5fe2764d3c17ba91bf2176207507a (diff)
downloadeclipse.platform.team-2f3feedb3e5936b17b9777561c2fc290bfec03c7.tar.gz
eclipse.platform.team-2f3feedb3e5936b17b9777561c2fc290bfec03c7.tar.xz
eclipse.platform.team-2f3feedb3e5936b17b9777561c2fc290bfec03c7.zip
Last minute bug fix:-)
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSWorkspaceRoot.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncCompareInput.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSWorkspaceRoot.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSWorkspaceRoot.java
index 1fba6a493..03eb6d141 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSWorkspaceRoot.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSWorkspaceRoot.java
@@ -164,7 +164,7 @@ public class CVSWorkspaceRoot {
ICVSResource managed = CVSWorkspaceRoot.getCVSResourceFor(project);
ICVSRemoteResource remote = CVSWorkspaceRoot.getRemoteResourceFor(project);
if (remote == null) {
- return null;
+ return new CVSRemoteSyncElement(true /*three way*/, project, null, null);
}
ArrayList cvsResources = new ArrayList();
for (int i = 0; i < resources.length; i++) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncCompareInput.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncCompareInput.java
index 31812252a..10f74c82a 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncCompareInput.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSSyncCompareInput.java
@@ -192,7 +192,7 @@ public class CVSSyncCompareInput extends SyncCompareInput {
RepositoryProvider provider = (RepositoryProvider)iter.next();
List resourceList = (List)providerMapping.get(provider);
final TeamException[] exception = new TeamException[1];
- trees[i] = CVSWorkspaceRoot.getRemoteSyncTree(
+ trees[i++] = CVSWorkspaceRoot.getRemoteSyncTree(
provider.getProject(),
(IResource[]) resourceList.toArray(new IResource[resourceList.size()]),
null /* tag */,

Back to the top