Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames2002-04-04 16:14:06 -0500
committerjames2002-04-04 16:14:06 -0500
commit777de9fd274aaafcbb04c3155a52d4fe3336fa13 (patch)
treee134647adc937d5054888dab5620432e4519be7a
parent35a1f2a4c1fd81f8396ef1f67a1f005125e4c359 (diff)
downloadeclipse.platform.team-777de9fd274aaafcbb04c3155a52d4fe3336fa13.tar.gz
eclipse.platform.team-777de9fd274aaafcbb04c3155a52d4fe3336fa13.tar.xz
eclipse.platform.team-777de9fd274aaafcbb04c3155a52d4fe3336fa13.zip
11409: Override conflicting outgoing deletion
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceUpdateSyncAction.java3
1 files changed, 3 insertions, 0 deletions
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;
}

Back to the top