hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update bump.sh for seperate release branches

Browse Source
This commit is contained in:
Daniel Gröber 2016-01-04 20:36:19 +01:00
parent 1c13cb3d3c
commit 0e63e8d326
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/bump.sh
View File

@ -16,6 +16,8 @@ fi
cd $(dirname $0)/.. cd $(dirname $0)/..
git checkout release-$VERSION
sed -i 's/(defconst ghc-version ".*")/(defconst ghc-version "'"$VERSION"'")/' \ sed -i 's/(defconst ghc-version ".*")/(defconst ghc-version "'"$VERSION"'")/' \
elisp/ghc.el elisp/ghc.el
@ -26,7 +28,7 @@ git commit -m "Bump version to $VERSION"
git checkout release git checkout release
#git merge master #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 \ ( tac ChangeLog; echo "\n$(date '+%Y-%m-%d') v$VERSION" ) | tac \
> ChangeLog.tmp > ChangeLog.tmp
@ -38,5 +40,4 @@ emacs -q -nw ChangeLog
git add ChangeLog git add ChangeLog
git commit -m "ChangeLog" git commit -m "ChangeLog"
git tag "v$VERSION" git tag "v$VERSION"