2011-02-01 Basile Starynkevitch <basile@starynkevitch.net>

        MELT branch merged with trunk rev 169468



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@169469 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 21 insertions, 15 deletions

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 0fff4297643..efec2a1b825 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-31  Gerald Pfeifer  <gerald@pfeifer.com>
+
+	* update_version_svn (FILES): Merge with datestamp_FILES.
+	(SVNROOT2): Introduce and use.
+	
+2011-01-30  Gerald Pfeifer  <gerald@pfeifer.com>
+
+	* update_version_svn (SVN): Remove obsolete comment.
+	(CURR_DATE): Fix description.
+	Fix description of checkout procedure.
+
 2010-12-18  Tobias Burnus  <burnus@net-b.de>
 
 	* update_web_docs_svn (MANUALS): Add libquadmath.
diff --git a/maintainer-scripts/update_version_svn b/maintainer-scripts/update_version_svn
index 736c990da82..20fd2b194ae 100755
--- a/maintainer-scripts/update_version_svn
+++ b/maintainer-scripts/update_version_svn
@@ -15,7 +15,6 @@ export SVNROOT
 /bin/mkdir /tmp/$$
 cd /tmp/$$
 
-# The path to cvs.
 SVN=${SVN:-/usr/bin/svn}
 
 # Compute the branches which we should update.
@@ -26,31 +25,27 @@ BRANCHES=`$SVN ls $SVNROOT/branches \
 # Always update the mainline.
 BRANCHES="${BRANCHES} ${ADD_BRANCHES}"
 
-# ARGS is passed to 'cvs co'
+# This is put into the datestamp files.
 CURR_DATE=`/bin/date +"%Y%m%d"`
 
-# version is all there is
 datestamp_FILES="gcc/DATESTAMP"
 
-FILES="$datestamp_FILES"
 
 # Assume all will go well.
 RESULT=0
 for BRANCH in $BRANCHES; do
   echo "Working on \"$BRANCH\"."
-  # Check out the files on the branch.  HEAD is a special case; if
-  # you check out files with -r HEAD, CVS will not let you check 
-  # in changes.
+  # Check out the files on the branch.  HEAD is in a different namespace.
   if test "$BRANCH" = HEAD; then 
-    for i in $FILES; do
-      ${SVN} -q co -N ${SVNROOT}/trunk/`dirname $i` `basename $i`
-    done
-  else
-    for i in $FILES; do
-      ${SVN} -q co -N ${SVNROOT}/branches/${BRANCH}/`dirname $i` `basename $i`
-    done
+    SVNROOT2=${SVNROOT}/trunk
+  else    
+    SVNROOT2=${SVNROOT}/branches/${BRANCH}
   fi
 
+  for i in $datestamp_FILES; do
+    ${SVN} -q co -N ${SVNROOT2}/`dirname $i` `basename $i`
+  done
+
   # There are no files to commit yet.
   COMMIT_FILES=""
 
@@ -81,7 +76,7 @@ for BRANCH in $BRANCHES; do
   fi
   
   # Remove the files.
-  for i in $FILES; do
+  for i in $datestamp_FILES; do
    rm -rf /tmp/$$/`basename $i`
   done
 done