Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2003-10-07 19:49:50 +0000
committerJean Michel-Lemieux2003-10-07 19:49:50 +0000
commit58d211c4031c51900454d7c79cdf4004617c9174 (patch)
tree239c4ff558fade6c5392aa0e4cdffadef82e8b12
parent1582accfa005ddc1faa9bb56d391f051013dae88 (diff)
downloadeclipse.platform.team-58d211c4031c51900454d7c79cdf4004617c9174.tar.gz
eclipse.platform.team-58d211c4031c51900454d7c79cdf4004617c9174.tar.xz
eclipse.platform.team-58d211c4031c51900454d7c79cdf4004617c9174.zip
*** empty log message ***
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java29
1 files changed, 29 insertions, 0 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java
index 5967c4bcb..0de2ee447 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java
@@ -363,6 +363,35 @@ public class CVSMergeSubscriberTest extends CVSSyncSubscriberTest {
subscriber.cancel();
}
+ public void testBug37546MergeWantsToDeleteNewDirectories() throws CVSException, CoreException {
+ IProject project = createProject("testBug37546", new String[]{"file1.txt", "folder1/", "folder1/a.txt", "folder1/b.txt"});
+ setContentsAndEnsureModified(project.getFile("file1.txt"), "some text\nwith several lines\n");
+ commitProject(project);
+
+ // Checkout and branch a copy
+ CVSTag root = new CVSTag("root_branch1", CVSTag.VERSION);
+ CVSTag branch = new CVSTag("branch1", CVSTag.BRANCH);
+ IProject branchedProject = branchProject(project, root, branch);
+
+ // modify the branch
+ addResources(branchedProject, new String[] {"folder2/", "folder2/c.txt"}, true);
+
+ // modify HEAD and add the same folder
+ addResources(project, new String[] {"folder2/"}, true);
+ addResources(project, new String[] {"folder3/"}, true);
+ addResources(project, new String[] {"folder4/", "folder4/d.txt"}, false);
+
+ // create a merge subscriber
+ CVSMergeSubscriber subscriber = createMergeSubscriber(project, root, branch);
+
+ assertSyncEquals("testBug37546", subscriber, project,
+ new String[]{"folder2/", "folder2/c.txt", "folder3/", "folder4/", "folder4/d.txt"}, true,
+ new int[]{
+ SyncInfo.IN_SYNC,
+ SyncInfo.INCOMING | SyncInfo.ADDITION,
+ SyncInfo.IN_SYNC, SyncInfo.IN_SYNC, SyncInfo.IN_SYNC});
+ }
+
public void testDisconnectingProject() throws CoreException, IOException, TeamException, InterruptedException {
// Create a test project (which commits it as well)
// Create a test project

Back to the top