diff options
Diffstat (limited to 'tests')
| -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++) { |