Bug 12149: Merge wizard: start and end tags should not be allowed to be the same

3 files changed, 17 insertions, 3 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java
index a51de75d9..aee5ab15d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java
@@ -33,7 +33,7 @@ public class MergeWizard extends Wizard {
 		startPage = new MergeWizardStartPage("startPage", Policy.bind("MergeWizard.start"), mergeImage);
 		startPage.setProject(project);
 		addPage(startPage);
-		endPage = new MergeWizardEndPage("endPage", Policy.bind("MergeWizard.end"), mergeImage);
+		endPage = new MergeWizardEndPage("endPage", Policy.bind("MergeWizard.end"), mergeImage, startPage);
 		endPage.setProject(project);
 		addPage(endPage);
 	}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizardEndPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizardEndPage.java
index d50c4d4c6..af91a2d0e 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizardEndPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizardEndPage.java
@@ -5,6 +5,9 @@ package org.eclipse.team.internal.ccvs.ui.merge;
  * All Rights Reserved.
  */
 
+import com.ibm.jvm.format.StartupSection;
+
+import org.eclipse.compare.internal.MergeSourceViewer;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -32,6 +35,8 @@ public class MergeWizardEndPage extends CVSWizardPage {
 	TreeViewer tree;
 	CVSTag result;
 	ICVSRemoteFolder remote;
+	// for accessing the start tag
+	MergeWizardStartPage startPage;
 	
 	/**
 	 * MergeWizardEndPage constructor.
@@ -40,9 +45,10 @@ public class MergeWizardEndPage extends CVSWizardPage {
 	 * @param title  the title of the page
 	 * @param titleImage  the image for the page
 	 */
-	public MergeWizardEndPage(String pageName, String title, ImageDescriptor titleImage) {
+	public MergeWizardEndPage(String pageName, String title, ImageDescriptor titleImage, MergeWizardStartPage startPage) {
 		super(pageName, title, titleImage);
 		setDescription(Policy.bind("MergeWizardEndPage.description"));
+		this.startPage = startPage;
 	}
 	/*
 	 * @see IDialogPage#createControl(Composite)
@@ -69,8 +75,15 @@ public class MergeWizardEndPage extends CVSWizardPage {
 				Object selected = ((IStructuredSelection)tree.getSelection()).getFirstElement();
 				if (selected instanceof TagElement) {
 					result = ((TagElement)selected).getTag();
-					setPageComplete(true);
+					if(!result.equals(startPage.getTag())) {
+						setPageComplete(true);
+						setMessage(null);
+					} else {
+						setMessage(Policy.bind("MergeWizardEndPage.duplicateTagSelected", result.getName()), WARNING_MESSAGE);
+						setPageComplete(false);
+					}
 				} else {
+					setMessage(null);
 					result = null;
 					setPageComplete(false);
 				}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
index b95d94d82..812fd156d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
@@ -298,6 +298,7 @@ MergeEditorInput.title=Merge {0} with {1}
 
 MergeWizardEndPage.branches=Branches
 MergeWizardEndPage.description=This is the version or branch that contains the work you would like to merge.
+MergeWizardEndPage.duplicateTagSelected=Cannot select {0} because it has already been selected as the start tag.
 
 MergeWizardStartPage.description=This is the version you created when you branched.