Do not apply TESTING/STABLE update to 2.11 branch.

This commit is contained in:
Michal Čihař
2010-08-20 13:53:01 +02:00
parent 2af8ff42e9
commit 86baee8d4e

View File

@@ -221,13 +221,17 @@ if [ $# -gt 0 ] ; then
tagname=RELEASE_`echo $version | tr . _ | tr '[:lower:]' '[:upper:]' | tr -d -`
echo "* Tagging release as $tagname"
git tag -a -m "Released $version" $tagname $branch
if echo $version | grep '[a-z_-]' ; then
mark_as_release $branch TESTING
if echo $version | grep -q '^2\.11\.' ; then
echo '* 2.11 branch, no STABLE/TESTING update'
else
# We update both branches here
# As it does not make sense to have older testing than stable
mark_as_release $branch TESTING
mark_as_release $branch STABLE
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
mark_as_release $branch TESTING
mark_as_release $branch STABLE
fi
fi
echo " Dont forget to push tags using: git push --tags"
;;