*** empty log message ***

2 files changed, 14 insertions, 5 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteCompareOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteCompareOperation.java
index de7227181..5928f7655 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteCompareOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteCompareOperation.java
@@ -116,7 +116,7 @@ public class RemoteCompareOperation extends RemoteOperation  implements RDiffSum
 
 	private String[] getOverlappingFilePaths() {
 		String[] leftFiles = getFilePaths(leftTree);
-		String[] rightFiles = getFilePaths(leftTree);
+		String[] rightFiles = getFilePaths(rightTree);
 		Set set = new HashSet();
 		for (int i = 0; i < rightFiles.length; i++) {
 			String rightFile = rightFiles[i];
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/unit/CompareOperationTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/unit/CompareOperationTests.java
index bad0d6d70..c7c21b58a 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/unit/CompareOperationTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/unit/CompareOperationTests.java
@@ -153,6 +153,15 @@ public class CompareOperationTests extends CVSOperationTest {
 		ICVSRemoteResource remoteResource = CVSWorkspaceRoot.getRemoteResourceFor(project);
 		TestRemoteCompareOperation op = new TestRemoteCompareOperation(null, remoteResource, v1);
 		run(op);
+		assertRevisionsMatch(op.getRightTree(), project, new String[] {"folder1/a.txt", "folder1/b.txt"}, null);
+		assertRevisionsMatch(op.getLeftTree(), copy, new String[] {"folder1/a.txt" }, new String[] {"folder1/newFile", "folder2/folder3/add.txt" } /* files with no revision */);
+		
+		
+		// Run the compare operation of the project folder the other way
+		remoteResource = CVSWorkspaceRoot.getRemoteResourceFor(project);
+		remoteResource = ((ICVSRemoteFolder)remoteResource).forTag(v1);
+		op = new TestRemoteCompareOperation(null, remoteResource, CVSTag.DEFAULT);
+		run(op);
 		assertRevisionsMatch(op.getLeftTree(), project, new String[] {"folder1/a.txt"}, new String[] {"folder1/b.txt"});
 		assertRevisionsMatch(op.getRightTree(), copy, new String[] {"folder1/a.txt", "folder1/newFile", "folder2/folder3/add.txt" }, null /* files with no revision */);
 		
@@ -160,15 +169,15 @@ public class CompareOperationTests extends CVSOperationTest {
 		remoteResource = CVSWorkspaceRoot.getRemoteResourceFor(project.getFolder("folder1"));
 		op = new TestRemoteCompareOperation(null, remoteResource, v1);
 		run(op);
-		assertRevisionsMatch(op.getLeftTree(), project, new String[] {"folder1/a.txt"}, new String[] {"folder1/b.txt"});
-		assertRevisionsMatch(op.getRightTree(), copy, new String[] {"folder1/a.txt", "folder1/newFile" }, null /* files with no revision */);
+		assertRevisionsMatch(op.getRightTree(), project, new String[] {"folder1/a.txt", "folder1/b.txt"}, null);
+		assertRevisionsMatch(op.getLeftTree(), copy, new String[] {"folder1/a.txt"}, new String[] {"folder1/newFile" } /* files with no revision */);
 		
 		// Run the operation on a single file
 		remoteResource = CVSWorkspaceRoot.getRemoteResourceFor(project.getFile("folder1/a.txt"));
 		op = new TestRemoteCompareOperation(null, remoteResource, v1);
 		run(op);
-		assertRevisionsMatch(op.getLeftTree(), project, new String[] {"folder1/a.txt"}, null);
-		assertRevisionsMatch(op.getRightTree(), copy, new String[] {"folder1/a.txt" }, null /* files with no revision */);
+		assertRevisionsMatch(op.getRightTree(), project, new String[] {"folder1/a.txt"}, null);
+		assertRevisionsMatch(op.getLeftTree(), copy, new String[] {"folder1/a.txt" }, null /* files with no revision */);
 		
 	}