nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge conflict resolved for Lori's tree merge to main

Browse Source
This commit is contained in:
ninadsp
2010-08-22 12:42:54 +05:30
parent e1f319eef1 7be8236208
commit c9253c0a0e
144 changed files with 81403 additions and 55891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/create-release.sh
View File

@@ -221,13 +221,18 @@ 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
git checkout master
fi
echo " Dont forget to push tags using: git push --tags"
;;