From e02f1491c99b24dc85d36edae52400dfb12bf070 Mon Sep 17 00:00:00 2001
From: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
Date: Fri, 22 Jul 2016 17:35:54 +0200
Subject: [PATCH] release.sh: don't mess the mainline Changelog with commits in
 maint

Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
---
 contrib/release.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/contrib/release.sh b/contrib/release.sh
index 485381f..1bc5d57 100755
--- a/contrib/release.sh
+++ b/contrib/release.sh
@@ -431,7 +431,6 @@ function run () {
   check_dirty
   prepare_env
   checkout_next
-  merge_maint
   clear
   welcome
 
@@ -456,8 +455,12 @@ function run () {
   build_announce "$new_version" "$previous_version"
   edit_announce
 
+  # Wait for the mainline and announce to be built to not include commits from
+  # maint.
+  merge_maint
   git_release $new_version
 
+  # Wait for all the Changelogs to be up-to-date in next.
   update_website $new_version
 }