44086: Error replacing new folder with latest

4 files changed, 26 insertions, 4 deletions

diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
index c9cb05bb3..0d6e11cd3 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
@@ -62,6 +62,7 @@ import org.eclipse.team.internal.ccvs.core.resources.RemoteFolder;
 import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo;
 import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;
 import org.eclipse.team.internal.ccvs.core.util.SyncFileChangeListener;
+import org.eclipse.team.internal.ccvs.ui.operations.*;
 import org.eclipse.team.internal.ccvs.ui.operations.CVSOperation;
 import org.eclipse.team.internal.ccvs.ui.operations.CheckoutSingleProjectOperation;
 import org.eclipse.team.internal.ccvs.ui.operations.ITagOperation;
@@ -212,6 +213,17 @@ public class EclipseTest extends EclipseWorkspaceTest {
 		return resources;
 	}
 	
+	
+	protected void replace(IContainer container, String[] hierarchy, CVSTag tag, boolean recurse) throws CoreException {
+		IResource[] resources = getResources(container, hierarchy);
+		replace(resources, tag, recurse);
+	}
+	
+	protected void replace(IResource[] resources, CVSTag tag, boolean recurse) throws CoreException {
+		ReplaceOperation op = new ReplaceOperation(null, resources, tag, recurse);
+		executeHeadless(op);
+	}
+	
 	public void updateProject(IProject project, CVSTag tag, boolean ignoreLocalChanges) throws TeamException {
 		LocalOption[] options = Command.NO_LOCAL_OPTIONS;
 		if(ignoreLocalChanges) {
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/CVSProviderTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/CVSProviderTest.java
index 8bf95c008..acc0d8974 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/CVSProviderTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/CVSProviderTest.java
@@ -267,7 +267,7 @@ public class CVSProviderTest extends EclipseTest {
 		setContentsAndEnsureModified(copy.getFile("changed.txt"));
 
 		// get the remote conetns
-		getProvider(copy).get(new IResource[] {copy}, IResource.DEPTH_INFINITE, DEFAULT_MONITOR);
+		replace(new IResource[] {copy}, null, true);
 		assertEquals(project, copy);
 	}
 	
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/IsModifiedTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/IsModifiedTests.java
index ca5382f2e..6db537a6f 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/IsModifiedTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/IsModifiedTests.java
@@ -239,7 +239,7 @@ public class IsModifiedTests extends EclipseTest {
 		assertModificationState(project, new String[] {".", "changed.txt", "folder1/", "folder1/a.txt"}, true);
 		commitResources(project, new String[] {"folder1/a.txt"});
 		assertModificationState(project, new String[] {".", "changed.txt"}, true);
-		getProvider(project).get(new IResource[] {project.getFile("changed.txt")}, IResource.DEPTH_INFINITE, DEFAULT_MONITOR);
+		replace(new IResource[] {project.getFile("changed.txt")}, null, true);
 		assertModificationState(project, null, true);
 	}
 
@@ -255,7 +255,7 @@ public class IsModifiedTests extends EclipseTest {
 		assertModificationState(project, new String[] {".", "changed.txt"}, true);
 		project.getFile("changed.txt").delete(false, DEFAULT_MONITOR);
 		assertModificationState(project, new String[] {".", "changed.txt"}, true);
-		getProvider(project).get(new IResource[] {project.getFile("changed.txt")}, IResource.DEPTH_INFINITE, DEFAULT_MONITOR);
+		replace(new IResource[] {project.getFile("changed.txt")}, null, true);
 		assertModificationState(project, null, true);
 		// modify, delete and commit a file
 		setContentsAndEnsureModified(project.getFile("changed.txt"));
@@ -455,7 +455,7 @@ public class IsModifiedTests extends EclipseTest {
 		// recreate folders and files
 		project.getFolder("folder1").create(false, true, DEFAULT_MONITOR);
 		assertModificationState(project, new String[] {".", "folder1/", "folder1/deleted.txt", "folder1/a.txt"}, true);
-		getProvider(project).get(new IResource[] {project.getFile("folder1/deleted.txt"), project.getFile("folder1/a.txt")}, IResource.DEPTH_INFINITE, DEFAULT_MONITOR);
+		replace(new IResource[] {project.getFile("folder1/deleted.txt"), project.getFile("folder1/a.txt")}, null, true);
 		assertModificationState(project, null, true);
 		
 		// delete a shared folder with files
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java
index 3e49f2ff0..a74012c96 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java
@@ -1194,4 +1194,14 @@ public class CVSWorkspaceSubscriberTest extends CVSSyncSubscriberTest {
 				SyncInfo.IN_SYNC, /* conflicting deletions are handled automatically */
 				SyncInfo.IN_SYNC});
 	}
+	
+	public void testOverrideAndUpdateOutgoingAddition() throws TeamException, CoreException {
+		// Create a test project (which commits it as well)
+		IProject project = createProject(new String[] { "file1.txt", "folder1/", "folder1/a.txt", "folder1/b.txt"});
+		IFolder newFolder = project.getFolder("newFolder");
+		newFolder.create(false, true, null);
+		IFile newFile = newFolder.getFile("newFile");
+		overrideAndUpdate(project, new String[] {"newFolder", "newFolder/newFile"}, true);
+		assertDoesNotExistInFileSystem(newFolder);
+	}
 }