From 27dba0e9aef5ae1b661870d0cec8aa17fdc9c33c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= <dxld@darkboxed.org>
Date: Sun, 7 Jun 2015 00:02:16 +0200
Subject: [PATCH] Update bump.sh

---
 scripts/bump.sh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/scripts/bump.sh b/scripts/bump.sh
index 445622e..986b46b 100755
--- a/scripts/bump.sh
+++ b/scripts/bump.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 if [ -z "$1" ]; then
     echo "Usage: $0 VERSION" >&2
     exit 1
@@ -19,6 +21,13 @@ sed -i 's/(defconst ghc-version ".*")/(defconst ghc-version "'"$VERSION"'")/' \
 
 sed -r -i 's/^(Version:[[:space:]]*)[0-9.]+/\1'"$VERSION"'/' ghc-mod.cabal
 
+git add elisp/ghc.el ghc-mod.cabal
+git commit -m "Bump version to $VERSION"
+
+git checkout release
+#git merge master
+git merge -s recursive -X theirs master
+
 ( tac ChangeLog; echo "\n$(date '+%Y-%m-%d') v$VERSION" ) | tac \
     > ChangeLog.tmp
 
@@ -26,6 +35,8 @@ mv ChangeLog.tmp ChangeLog
 
 emacs -q -nw ChangeLog
 
-git add ChangeLog elisp/ghc.el ghc-mod.cabal
-git commit -m "Bump version to $VERSION"
+git add ChangeLog
+git commit -m "ChangeLog"
+
+
 git tag "v$VERSION"