release.sh: learn to merge maint branch into next before releasing

Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
This commit is contained in:
Nicolas Sebrecht 2016-07-22 09:50:06 +02:00
parent 034c55a278
commit 6d0dba0d86

View File

@ -138,6 +138,14 @@ function checkout_next () {
}
function merge_maint () {
debug 'in merge_maint'
git merge --quiet -Xours maint || {
die 7 "Could not merge 'maint' branch"
}
}
function get_version () {
debug 'in get_version'
echo "v$(./offlineimap.py --version)"
@ -423,6 +431,7 @@ function run () {
check_dirty
prepare_env
checkout_next
merge_maint
clear
welcome