# HG changeset patch
# User Chris Cannam
# Date 1299069497 0
# Node ID 124a3ea9fafb556cc47ec8f3d4cfdad3fd8596aa
# Parent  5144926b715e5ac48c5bf11d24aced65e0fde9d5# Parent  806e9cb9ce618655fd279c24a7cf461c64663fd4
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)

diff -r 5144926b715e -r 124a3ea9fafb deploy/osx/deploy.sh
--- a/deploy/osx/deploy.sh	Wed Mar 02 12:32:50 2011 +0000
+++ b/deploy/osx/deploy.sh	Wed Mar 02 12:38:17 2011 +0000
@@ -33,20 +33,17 @@
 install_name_tool -id QtGui "$app.app/Contents/Frameworks/QtGui"
 install_name_tool -id QtNetwork "$app.app/Contents/Frameworks/QtNetwork"
 
-install_name_tool -change QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore "$app.app/Contents/MacOS/$app"
-install_name_tool -change QtGui.framework/Versions/4/QtGui @executable_path/../Frameworks/QtGui "$app.app/Contents/MacOS/$app"
-install_name_tool -change QtNetwork.framework/Versions/4/QtNetwork @executable_path/../Frameworks/QtNetwork "$app.app/Contents/MacOS/$app"
-
-install_name_tool -change QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore "$app.app/Contents/MacOS/kdiff3"
-install_name_tool -change QtGui.framework/Versions/4/QtGui @executable_path/../Frameworks/QtGui "$app.app/Contents/MacOS/kdiff3"
-install_name_tool -change QtNetwork.framework/Versions/4/QtNetwork @executable_path/../Frameworks/QtNetwork "$app.app/Contents/MacOS/kdiff3"
-
-install_name_tool -change QtCore.framework/Versions/4/QtCore @loader_path/QtCore "$app.app/Contents/Frameworks/QtGui"
-install_name_tool -change QtCore.framework/Versions/4/QtCore @loader_path/QtCore "$app.app/Contents/Frameworks/QtNetwork"
-
-install_name_tool -change QtCore.framework/Versions/4/QtCore @loader_path/../../Frameworks/QtCore "$app.app/Contents/MacOS/PyQt4/QtCore.so"
-install_name_tool -change QtCore.framework/Versions/4/QtCore @loader_path/../../Frameworks/QtCore "$app.app/Contents/MacOS/PyQt4/QtGui.so"
-install_name_tool -change QtCore.framework/Versions/4/QtCore @loader_path/../../Frameworks/QtGui "$app.app/Contents/MacOS/PyQt4/QtGui.so"
+for fwk in QtCore QtGui QtNetwork; do
+	find "$app.app" -type f -print | while read x; do
+		current=$(otool -L "$x" | grep "$fwk.framework/" | awk '{ print $1; }')
+		[ -z "$current" ] && continue
+		echo "$x has $current"
+		relative=$(echo "$x" | sed -e "s,$app.app/Contents/,," \
+			-e 's,[^/]*/,../,g' -e 's,/[^/]*$,/Frameworks/'"$fwk"',' )
+		echo "replacing with relative path $relative"
+		install_name_tool -change "$current" "@loader_path/$relative" "$x"
+	done
+done
 
 echo "Done: be sure to run the app and see that it works!"
 
diff -r 5144926b715e -r 124a3ea9fafb mainwindow.cpp
--- 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,