From 777de9fd274aaafcbb04c3155a52d4fe3336fa13 Mon Sep 17 00:00:00 2001
From: james
Date: Thu, 4 Apr 2002 21:14:06 +0000
Subject: 11409: Override conflicting outgoing deletion

---
 .../org/eclipse/team/internal/ccvs/ui/sync/ForceUpdateSyncAction.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceUpdateSyncAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceUpdateSyncAction.java
index 6caa169a2..ad080d586 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceUpdateSyncAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceUpdateSyncAction.java
@@ -208,6 +208,9 @@ public class ForceUpdateSyncAction extends MergeAction {
 								updateShallow.add(resource);
 							} else {
 								updateIgnoreLocalShallow.add(resource);
+								if (!resource.exists()) {
+									makeIncoming.add(changed[i]);
+								}
 							}
 							break;
 					}
-- 
cgit v1.2.3