bug[ats_B2207]: Re-baselining causes rename of baseline branch0.10.0.v201206290049_REL

1 files changed, 10 insertions, 1 deletions

diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java
index 988c6786093..e7032f8301d 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java
@@ -494,7 +494,16 @@ public class MergeXWidget extends GenericXWidget {
 
    private void checkForCompleteCommit() {
       boolean isVisible = !hasMergeBranchBeenCommitted() && areAllConflictsResolved();
-      isVisible &= sourceBranch != null && sourceBranch.getBranchState().isRebaselineInProgress();
+      if (sourceBranch != null) {
+         try {
+            isVisible &=
+               sourceBranch.getBranchState().isRebaselineInProgress() && sourceBranch.getParentBranch().equals(
+                  destBranch.getParentBranch());
+         } catch (OseeCoreException ex) {
+            OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
+            isVisible = false;
+         }
+      }
       setCompleteCommitItemVisible(isVisible);
    }