diff mainwindow.cpp @ 318:124a3ea9fafb easyhg_v0.4

Merge, and add a helpful warning when you try to push before committing your merge (I just did this and the ensuing warning was misleading)

--- a/mainwindow.cpp	Wed Mar 02 12:32:50 2011 +0000
+++ b/mainwindow.cpp	Wed Mar 02 12:38:17 2011 +0000
@@ -1708,6 +1708,13 @@
              tr("Push failed"),
              tr("Your local repository could not be pushed to the remote repository.<br><br>You may need to merge the changes locally first."),
              output);
+    } else if (m_hgTabs->canCommit() && m_currentParents.size() > 1) {
+        MoreInformationDialog::warning
+            (this,
+             tr("Push failed"),
+             tr("Push failed"),
+             tr("Your local repository could not be pushed to the remote repository.<br><br>You have an uncommitted merge in your local folder.  You probably need to commit it before you push."),
+             output);
     } else {
         MoreInformationDialog::warning
             (this,