From 0e63e8d3263620e74d11173cdb34cdffca383c27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= <dxld@darkboxed.org>
Date: Mon, 4 Jan 2016 20:36:19 +0100
Subject: [PATCH] Update bump.sh for seperate release branches

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

diff --git a/scripts/bump.sh b/scripts/bump.sh
index 986b46b..1e19c83 100755
--- a/scripts/bump.sh
+++ b/scripts/bump.sh
@@ -16,6 +16,8 @@ fi
 
 cd $(dirname $0)/..
 
+git checkout release-$VERSION
+
 sed -i 's/(defconst ghc-version ".*")/(defconst ghc-version "'"$VERSION"'")/' \
     elisp/ghc.el
 
@@ -26,7 +28,7 @@ git commit -m "Bump version to $VERSION"
 
 git checkout release
 #git merge master
-git merge -s recursive -X theirs master
+git merge -s recursive -X theirs release-$VERSION
 
 ( tac ChangeLog; echo "\n$(date '+%Y-%m-%d') v$VERSION" ) | tac \
     > ChangeLog.tmp
@@ -38,5 +40,4 @@ emacs -q -nw ChangeLog
 git add ChangeLog
 git commit -m "ChangeLog"
 
-
 git tag "v$VERSION"