From 57565cccfd4559815cc13e91c562e7b27c8751c0 Mon Sep 17 00:00:00 2001
From: Jean Michel-Lemieux
Date: Tue, 19 Aug 2003 15:56:50 +0000
Subject: Added override and update command. Added a message dialog that warns
the user on an update if changes conflicts cannot be merged by the update.
Added subscriber action groups to the synchronize view.
---
bundles/org.eclipse.team.cvs.ui/plugin.properties | 5 ++-
bundles/org.eclipse.team.cvs.ui/plugin.xml | 21 +++++++----
.../team/internal/ccvs/ui/messages.properties | 7 ++--
.../ui/subscriber/OverrideAndUpdateAction.java | 26 ++++++++++++++
.../ccvs/ui/subscriber/SafeUpdateAction.java | 41 ++++++++++++++++++----
.../ui/subscriber/SyncInfoSetDetailsDialog.java | 6 ++--
.../internal/ccvs/ui/subscriber/UpdateDialog.java | 2 +-
.../ccvs/ui/subscriber/WorkspaceUpdateAction.java | 3 +-
.../ui/sync/actions/SyncViewerActions.java | 10 +++++-
.../core/subscriber/TestWorkspaceUpdateAction.java | 7 ++++
10 files changed, 106 insertions(+), 22 deletions(-)
create mode 100644 bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java
diff --git a/bundles/org.eclipse.team.cvs.ui/plugin.properties b/bundles/org.eclipse.team.cvs.ui/plugin.properties
index 5578d3cd7..2cae29824 100644
--- a/bundles/org.eclipse.team.cvs.ui/plugin.properties
+++ b/bundles/org.eclipse.team.cvs.ui/plugin.properties
@@ -176,7 +176,10 @@ CVSWorkspaceSubscriber.commit.label=&Commit
CVSWorkspaceSubscriber.commit.tooltip=Perform a commit on the visible resources
CVSWorkspaceSubscriber.overcommit.label=&Override and Commit
-CVSWorkspaceSubscriber.overcommit.tooltip=Perform an override and commit on the visible resources. This will make the remote contents equal to the local.
+CVSWorkspaceSubscriber.overcommit.tooltip=Perform an override and commit on the visible resources. This will make the remote contents equal to the local ignoring any remote changes.
+
+CVSWorkspaceSubscriber.overupdate.label=O&verride and Update
+CVSWorkspaceSubscriber.overupdate.tooltip=Perform an override and update on the visible resources. This will make the local contents equal to the remote ignoring any local changes.
CVSWorkspaceSubscriber.confirmMerged.label=&Mark as Merged
CVSWorkspaceSubscriber.confirmMerged.tooltip=Mark the conflict as merged by upgrading the base to match the remote
diff --git a/bundles/org.eclipse.team.cvs.ui/plugin.xml b/bundles/org.eclipse.team.cvs.ui/plugin.xml
index 8994a5754..8d79739e8 100644
--- a/bundles/org.eclipse.team.cvs.ui/plugin.xml
+++ b/bundles/org.eclipse.team.cvs.ui/plugin.xml
@@ -572,7 +572,7 @@
+
+
+