From 9c09dbd077d8d17b46de2f3c31f40dddaff8e358 Mon Sep 17 00:00:00 2001 From: kalyan prasad Date: Wed, 9 May 2018 16:16:47 +0530 Subject: Bug 532617 - Replace headstream instead of branch Change-Id: Ia944a7e0786cfec92750ea9a8ff9efabb7ddc672 Signed-off-by: kalyan prasad --- .../team/internal/ccvs/ui/actions/ReplaceWithRemoteAction.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRemoteAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRemoteAction.java index c9a79db13..a540f3b35 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRemoteAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRemoteAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2018 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 @@ -15,6 +15,7 @@ import java.lang.reflect.InvocationTargetException; import org.eclipse.jface.action.IAction; import org.eclipse.jface.window.Window; import org.eclipse.swt.widgets.Display; +import org.eclipse.team.internal.ccvs.core.CVSTag; import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; import org.eclipse.team.internal.ccvs.ui.operations.ReplaceOperation; @@ -22,8 +23,8 @@ import org.eclipse.team.internal.ccvs.ui.operations.ReplaceOperation; public class ReplaceWithRemoteAction extends WorkspaceTraversalAction { public void execute(IAction action) throws InvocationTargetException, InterruptedException { - - final ReplaceOperation replaceOperation = new ReplaceOperation(getTargetPart(), getCVSResourceMappings(), null); + // Using CVSTag.BASE similar to ReplaceWithLatestRevisionAction + final ReplaceOperation replaceOperation = new ReplaceOperation(getTargetPart(), getCVSResourceMappings(), CVSTag.BASE); if (hasOutgoingChanges(replaceOperation)) { final boolean[] keepGoing = new boolean[] { true }; Display.getDefault().syncExec(new Runnable() { -- cgit v1.2.3 From 06b1f593759c48fa39345a475c089d200145c8cf Mon Sep 17 00:00:00 2001 From: Kalyan Prasad Tatavarthi Date: Thu, 10 May 2018 11:13:44 +0530 Subject: Bug 532617 - Replace headstream instead of branch. Increasing the bundle version. Change-Id: I3e85ef2eab267053a4d34c08f85aef18a463107e Signed-off-by: Kalyan Prasad Tatavarthi --- bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF | 2 +- bundles/org.eclipse.team.cvs.ui/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF index 9be6f1db6..fdcf6918d 100644 --- a/bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.team.cvs.ui; singleton:=true -Bundle-Version: 3.4.1.qualifier +Bundle-Version: 3.4.2.qualifier Bundle-Activator: org.eclipse.team.internal.ccvs.ui.CVSUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.team.cvs.ui/pom.xml b/bundles/org.eclipse.team.cvs.ui/pom.xml index 6853d6b07..848a535b9 100644 --- a/bundles/org.eclipse.team.cvs.ui/pom.xml +++ b/bundles/org.eclipse.team.cvs.ui/pom.xml @@ -1,6 +1,6 @@