diff options
| author | Michael Valenta | 2005-04-07 20:09:02 +0000 |
|---|---|---|
| committer | Michael Valenta | 2005-04-07 20:09:02 +0000 |
| commit | fc9395adbbff7adce6a96bdd34f926025682754e (patch) | |
| tree | db61b6cd1e8e5674562d7b5aa6e2c8b4c8f5fea6 /bundles | |
| parent | e1519d24cb7af9bca8d9e2d27e10e9c314f053f8 (diff) | |
| download | eclipse.platform.team-fc9395adbbff7adce6a96bdd34f926025682754e.tar.gz eclipse.platform.team-fc9395adbbff7adce6a96bdd34f926025682754e.tar.xz eclipse.platform.team-fc9395adbbff7adce6a96bdd34f926025682754e.zip | |
Bug 84561 commit sets clash with merging
Diffstat (limited to 'bundles')
| -rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java index 6adf35772..a93f540e4 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java @@ -278,4 +278,9 @@ public class MergeSynchronizeParticipant extends CVSParticipant { protected String getShortTaskName() { return CVSUIMessages.Participant_merging; //$NON-NLS-1$ } + + protected CVSChangeSetCapability createChangeSetCapability() { + // See bug 84561 for a description of the problems with Merge Change Sets + return null; + } } |