Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-06-07 12:14:49 -0400
committerMichael Valenta2002-06-07 12:14:49 -0400
commit702644a55426b6c49769b0ef10171fbead5125d5 (patch)
tree088b8791ef2755d122fb821f51c52285c029d22c
parentc462484a49ebe26312eacdd763b8b5642f130e55 (diff)
downloadeclipse.platform.team-702644a55426b6c49769b0ef10171fbead5125d5.tar.gz
eclipse.platform.team-702644a55426b6c49769b0ef10171fbead5125d5.tar.xz
eclipse.platform.team-702644a55426b6c49769b0ef10171fbead5125d5.zip
18639: False warning prompt when replace with "Base"
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java
index 8991904ad..c73e6e376 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java
@@ -347,7 +347,9 @@ abstract public class CVSAction extends TeamAction {
if (resource.getType() != IResource.PROJECT) {
ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource);
CVSTag parentTag = cvsResource.getParent().getFolderSyncInfo().getTag();
- if (!CVSTag.equalTags(tag, parentTag)) {
+ // prompt if the tags are not equal
+ // consider BASE to be equal the parent tag since we don't make BASE sticky on replace
+ if (!CVSTag.equalTags(tag, parentTag) && !CVSTag.equalTags(tag, CVSTag.BASE)) {
shell.getDisplay().syncExec(new Runnable() {
public void run() {
AvoidableMessageDialog dialog = new AvoidableMessageDialog(

Back to the top