diff options
| author | Malgorzata Janczarska | 2013-03-29 09:34:08 +0000 |
|---|---|---|
| committer | Malgorzata Janczarska | 2013-03-29 09:50:23 +0000 |
| commit | 79c5562d4c74180311d4b7d7e8f82ffa068e9cb7 (patch) | |
| tree | 5be25581affc96b2d7c11946b52c29503a56f536 | |
| parent | 0118bc1e0ef0723730ff05f75041340ed966ef19 (diff) | |
| download | eclipse.platform.team-79c5562d4c74180311d4b7d7e8f82ffa068e9cb7.tar.gz eclipse.platform.team-79c5562d4c74180311d4b7d7e8f82ffa068e9cb7.tar.xz eclipse.platform.team-79c5562d4c74180311d4b7d7e8f82ffa068e9cb7.zip | |
Bug 403309 - Test failure: CVSMergeSubscriberTest#testLocalScrubI20130402-0800
| -rw-r--r-- | tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java | 3 |
1 files changed, 3 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 dca2be120..acd66d64f 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 @@ -344,6 +344,9 @@ public class CVSMergeSubscriberTest extends CVSSyncSubscriberTest { SyncInfo.INCOMING | SyncInfo.DELETION, SyncInfo.INCOMING | SyncInfo.CHANGE}); + //Refresh project to make sure we delete all existing files. See bug 403309 + project.refreshLocal(IProject.DEPTH_INFINITE, DEFAULT_MONITOR); + // scrub the project contents IResource[] members = project.members(); for (int i = 0; i < members.length; i++) { |