Don't merge a non-next_stable starting branch, because we don't want changes belonging to the next dev iteration and such. Those would confuse our next_stable-related logic and lead again to changes in non-next-stable merged back to next-stable etc.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/3ad1468d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/3ad1468d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/3ad1468d Branch: refs/heads/next_stable Commit: 3ad1468df00a1f0d0bc4b819acb5ba7f4b88a38c Parents: 23b4260 Author: Thorsten Schöning <[email protected]> Authored: Wed Aug 16 11:18:20 2017 +0200 Committer: Thorsten Schöning <[email protected]> Committed: Wed Aug 16 11:18:20 2017 +0200 ---------------------------------------------------------------------- releasePrepare.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/3ad1468d/releasePrepare.sh ---------------------------------------------------------------------- diff --git a/releasePrepare.sh b/releasePrepare.sh index c2ad1f8..679a6a6 100755 --- a/releasePrepare.sh +++ b/releasePrepare.sh @@ -34,8 +34,10 @@ branch_starting_is_ns=$(git branch | grep "\* next_stable") if [ -z "${branch_starting_is_ns}" ] then + # If we didn't start with "next_stable", don't merge the starting branch, because it contains + # changes regarding new development iteration etc. we don't want to have. People need to merge + # relevant changes manually. git checkout "next_stable" || git checkout -b "next_stable" - git merge "${branch_starting}" fi today=$(date "+%Y-%m-%d")
