From cb626061eebb26c1742c507e8b624f8776166f4a Mon Sep 17 00:00:00 2001
From: Malgorzata Janczarska
Date: Thu, 14 Mar 2013 11:26:53 +0100
Subject: Bug 403309 - Test failure: CVSMergeSubscriberTest#testLocalScrub -
 change deleting to force.

---
 .../team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/org.eclipse.team.tests.cvs.core')

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
-- 
cgit v1.2.1