Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMalgorzata Janczarska2013-03-14 10:26:53 +0000
committerMalgorzata Janczarska2013-03-14 10:28:44 +0000
commitcb626061eebb26c1742c507e8b624f8776166f4a (patch)
treeb4ce2e121b695fab6bfba7e3df9a09f8dc6de70d
parent487a72456862af1e5443978eb3b9bdd2a8fc1d58 (diff)
downloadeclipse.platform.team-cb626061eebb26c1742c507e8b624f8776166f4a.tar.gz
eclipse.platform.team-cb626061eebb26c1742c507e8b624f8776166f4a.tar.xz
eclipse.platform.team-cb626061eebb26c1742c507e8b624f8776166f4a.zip
Bug 403309 - Test failure: CVSMergeSubscriberTest#testLocalScrub -
change deleting to force.
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java4
1 files changed, 2 insertions, 2 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 401b288ff..dca2be120 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -349,7 +349,7 @@ public class CVSMergeSubscriberTest extends CVSSyncSubscriberTest {
for (int i = 0; i < members.length; i++) {
IResource resource = members[i];
if (resource.getName().equals(".project")) continue;
- resource.delete(false, DEFAULT_MONITOR);
+ resource.delete(true, DEFAULT_MONITOR);
}
// update

Back to the top