From 223951c886e73b296668d9dddc95c35e30beb060 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 13 Oct 2006 07:40:50 +0000
Subject: [PATCH] Readd snapshot support.

---
 ChangeLog                 |  1 +
 scripts/create-release.sh | 28 +++++++++-------------------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f36c532fcc..624f40ce6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ $Source$
 
 2006-10-13 Michal Čihař  <michal@cihar.com>
     * Documentation.html: Mention wiki.
+    * scripts/create-release.sh: Readd snapshot support.
 
 2006-10-12 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_change.php: bug #1566219, automated timestamp values
diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index 95d054df5a..a14cf830c8 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -68,16 +68,14 @@
 # - added release todo list
 #
 
-cvsserver=${cvsserver:-phpmyadmin.cvs.sourceforge.net}
 KITS="all-languages-utf-8-only all-languages english"
 COMPRESSIONS="zip-7z tbz tgz 7z"
 
-# third param is the user; when creating a release we don't want
-# to suffer from the delay between anonymous cvs and developer cvs
-
 if [ $# = 0 ]
 then
-  echo "Usage: create-release.sh version from_branch"
+  echo "Usages:"
+  echo "  create-release.sh <version> [from_branch]"
+  echo "  create-release.sh snapshot [sf]"
   echo "  (no spaces allowed!)"
   echo ""
   echo "Examples:"
@@ -123,23 +121,15 @@ END
     fi
 fi
 
-# FIXME: this was kept, but actually this is not used
-if [ "$mode" = "snapshot" -a "$2" != "local" ] ; then
-# Goto project dir
+if [ "$mode" = "snapshot" -a "$2" = "sf" ] ; then
+    # Goto project dir
     cd /home/groups/p/ph/phpmyadmin/htdocs
 
-## Move old cvs dir
-#if [ -e cvs ];
-#then
-#    mv cvs cvs-`date +%s`
-#fi
-
-# Keep one previous version of the cvs directory
-    if [ -e cvs-prev ];
-    then
-        rm -rf cvs-prev
+    # Keep one previous version of the cvs directory
+    if [ -e svn-prev ] ; then
+        rm -rf svn-prev
     fi
-    mv cvs cvs-prev
+    mv svn svn-prev
 fi
 
 # Do SVNcheckout
-- 
2.11.4.GIT