comparison src/mainwindow.cpp @ 648:b55466f7b8bf

Adjust text when closing something that is only a single sprout of a branch -- and don't warn when closing a sprout of the default branch (it's not the same thing as closing the default branch)

     QString cf(tr("Close branch"));
     QString comment;
 
     QString defaultWarning;
 
+    bool haveSprouts = (m_hgMergeAct->isEnabled());
+
     QString branchText;
     if (m_currentBranch == "" || m_currentBranch == "default") {
         branchText = tr("the default branch");
-        defaultWarning = tr("<p><b>Warning:</b> you are asking to close the default branch. This is not usually a good idea!</p>");
+        if (!haveSprouts) {
+            defaultWarning = tr("<p><b>Warning:</b> you are asking to close the default branch. This is not usually a good idea!</p>");
+        }
     } else {
         branchText = tr("branch \"%1\"").arg(m_currentBranch);
+    }
+
+    if (haveSprouts) {
+        branchText = tr("a sub-branch of %1").arg(branchText);
     }
 
     if (ConfirmCommentDialog::confirmAndGetLongComment
         (this,
          cf,