Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2004-05-01 02:00:08 +0000
committerMichael Valenta2004-05-01 02:00:08 +0000
commit8a220791a63270021e7c6eaaac9237b2d810c0ad (patch)
treefa2829f5a557158305775948874e80c37329f397
parent5ea4b75d9c6389caa98abfd222ae4fa06c85f08f (diff)
downloadeclipse.platform.team-8a220791a63270021e7c6eaaac9237b2d810c0ad.tar.gz
eclipse.platform.team-8a220791a63270021e7c6eaaac9237b2d810c0ad.tar.xz
eclipse.platform.team-8a220791a63270021e7c6eaaac9237b2d810c0ad.zip
50004: Moving branch tags does not work with CVS 1.11.2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RTag.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java3
2 files changed, 5 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RTag.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RTag.java
index 0baca4b3a..8fd2929d3 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RTag.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RTag.java
@@ -29,7 +29,8 @@ public class RTag extends RemoteCommand {
/*** Local options: specific to tag ***/
public static final LocalOption CREATE_BRANCH = Tag.CREATE_BRANCH;
public static final LocalOption CLEAR_FROM_REMOVED = new LocalOption("-a", null); //$NON-NLS-1$
- public static final LocalOption FORCE_REASSIGNMENT = new LocalOption("-F", null); //$NON-NLS-1$
+ public static final LocalOption FORCE_REASSIGNMENT = new LocalOption("-F", null); //$NON-NLS-1$
+ public static final LocalOption FORCE_BRANCH_REASSIGNMENT = new LocalOption("-B", null); //$NON-NLS-1$
/*** Default command output listener ***/
private static final ICommandOutputListener DEFAULT_OUTPUT_LISTENER = new TagListener();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java
index 0557d0593..97f3d3a03 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java
@@ -95,6 +95,9 @@ public class TagInRepositoryOperation extends RemoteOperation implements ITagOpe
public void moveTag() {
addLocalOption(RTag.FORCE_REASSIGNMENT);
addLocalOption(RTag.CLEAR_FROM_REMOVED);
+ if (tag != null && tag.getType() == CVSTag.BRANCH) {
+ addLocalOption(RTag.FORCE_BRANCH_REASSIGNMENT);
+ }
}
/* (non-Javadoc)

Back to the top