The branch, master has been updated via 8f49a1a642b2248ebd4d3cfd0f57cf14a20cd72c (commit) from 21766b684be69f185b85c61d6da07af02d5d71b2 (commit) - Log ----------------------------------------------------------------- commit 8f49a1a642b2248ebd4d3cfd0f57cf14a20cd72c Author: Michal Čihař <mcihar@novell.com> Date: Wed May 11 14:18:52 2011 +0200 Adjust STABLE/TESTING marking for new major release (in case there will ever be bugfix for 3.3). ----------------------------------------------------------------------- Summary of changes: scripts/create-release.sh | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index cd91e99..0589c28 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -241,17 +241,15 @@ if [ $# -gt 0 ] ; then git tag -a -m "Released $version" $tagname $branch if echo $version | grep -q '^2\.11\.' ; then echo '* 2.11 branch, no STABLE/TESTING update' + elif echo $version | grep -q '^3\.3\.' ; then + echo '* 3.3 branch, no STABLE/TESTING update' else if echo $version | grep '[a-z_-]' ; then mark_as_release $branch TESTING else # We update both branches here # As it does not make sense to have older testing than stable - if echo $version | grep -q '^3\.3\.' ; then - echo '* 3.3 branch, no TESTING update' - else - mark_as_release $branch TESTING - fi + mark_as_release $branch TESTING mark_as_release $branch STABLE fi git checkout master hooks/post-receive -- phpMyAdmin