Abort if merge fails

svn changeset:22856/svn branch:6.8

diff --git a/scripts/merge.sh b/scripts/merge.sh
index 40423691e8b29a9b141cfe02c6e98097b34c18f3..a8c356ad30bb21f9dc3e2ae981a17583e7e9d826 100755 (executable)
--- a/scripts/merge.sh
+++ b/scripts/merge.sh
@@ -28,6 +28,12 @@ sourceurl="$currentrepowithoutversion/$FROM"
 
 msg=`svn log $sourceurl -r $REVISION --xml|grep "<msg>"|sed "s/<msg>//"|sed "s/<\/msg>//"`
 svn merge $sourceurl . -c $REVISION
+if [ "$?" != "0" ]
+then
+       echo "Merge failed. Conflicts must be resolved manually!"
+       exit 3
+fi
+
 msg="[merge from $FROM] $msg"
 if [ "$AUTOCOMMIT" = "autocommit" ]
 then