From 67037e59a428c3b9abfb58c02228885f4372566e Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Thu, 2 Feb 2012 10:15:50 +0000
Subject: Abort if merge fails

svn changeset:22856/svn branch:6.8
---
 scripts/merge.sh | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'scripts/merge.sh')

diff --git a/scripts/merge.sh b/scripts/merge.sh
index 40423691e8..a8c356ad30 100755
--- 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
-- 
cgit v1.2.3