[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1910-g715b0b8

Michal Čihař nijel at users.sourceforge.net
Tue Feb 8 16:26:05 CET 2011


The branch, master has been updated
       via  715b0b86b564ad8d625914110b802aaf4bb915fd (commit)
      from  a4fda28f0c3b4010c38ec11a7367f5a22b6cbedc (commit)


- Log -----------------------------------------------------------------
commit 715b0b86b564ad8d625914110b802aaf4bb915fd
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Feb 8 16:25:40 2011 +0100

    Do not mark anything from 3.3 branch as testing

-----------------------------------------------------------------------

Summary of changes:
 scripts/create-release.sh |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index 87a1bff..e7d6f39 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -243,7 +243,11 @@ if [ $# -gt 0 ] ; then
                     else
                         # We update both branches here
                         # As it does not make sense to have older testing than stable
-                        mark_as_release $branch TESTING
+                        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 STABLE
                     fi
                     git checkout master


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list