Added explicit override and commit action and change dupdate to not perform the override and update.

1 files changed, 8 insertions, 1 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java
index c5b367f4e..4b398950d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java
@@ -43,6 +43,13 @@ import org.eclipse.team.ui.sync.SyncInfoSet;
 public class MergeUpdateAction extends SafeUpdateAction {
 	
 	/* (non-Javadoc)
+	 * @see org.eclipse.team.internal.ccvs.ui.subscriber.SafeUpdateAction#getOverwriteLocalChanges()
+	 */
+	protected boolean getOverwriteLocalChanges() {
+		return true;
+	}
+
+	/* (non-Javadoc)
 	 * @see org.eclipse.team.ui.sync.SubscriberAction#getSyncInfoFilter()
 	 */
 	protected SyncInfoFilter getSyncInfoFilter() {
@@ -198,5 +205,5 @@ public class MergeUpdateAction extends SafeUpdateAction {
 		if (!cvsFolder.exists()) {
 			cvsFolder.mkdir();
 		}
-	}	
+	}
 }