diff options
Diffstat (limited to 'scripts')
| -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 |