Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkalyan prasad2018-05-09 06:46:47 -0400
committerKalyan Prasad Tatavarthi2018-05-09 13:58:58 -0400
commit7796144c50d1283655ae680fd779cdb5661caf64 (patch)
tree9e4c6aee6c16e7f50b377460fe70343edde052b6
parent05c13669de3664d4d47cab902dcf7cc08145d7e9 (diff)
downloadeclipse.platform.team-7796144c50d1283655ae680fd779cdb5661caf64.tar.gz
eclipse.platform.team-7796144c50d1283655ae680fd779cdb5661caf64.tar.xz
eclipse.platform.team-7796144c50d1283655ae680fd779cdb5661caf64.zip
Bug 532617 - Replace headstream instead of branch
Change-Id: Ia944a7e0786cfec92750ea9a8ff9efabb7ddc672 Signed-off-by: kalyan prasad <kalyan_prasad@in.ibm.com>
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRemoteAction.java7
1 files 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() {

Back to the top