diff options
| author | Artur Signell <artur.signell@itmill.com> | 2012-02-02 10:15:50 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2012-02-02 10:15:50 +0000 |
| commit | 67037e59a428c3b9abfb58c02228885f4372566e (patch) | |
| tree | 0fccd5d79080923b2efb4c30092e751a628aeada | |
| parent | 98737932a588f1b4a8f8115f2545da63ae7f4e4a (diff) | |
| download | vaadin-framework-67037e59a428c3b9abfb58c02228885f4372566e.tar.gz vaadin-framework-67037e59a428c3b9abfb58c02228885f4372566e.zip | |
Abort if merge fails
svn changeset:22856/svn branch:6.8
| -rwxr-xr-x | scripts/merge.sh | 6 |
1 files changed, 6 insertions, 0 deletions
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 |