* update_version_svn (FILES): Merge with datestamp_FILES.

	(SVNROOT2): Introduce and use.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@169428 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 13 insertions, 10 deletions

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 8ea38a9314f..efec2a1b825 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/maintainer-scripts/update_version_svn b/maintainer-scripts/update_version_svn
index b7c7d1f032e..20fd2b194ae 100755
--- a/maintainer-scripts/update_version_svn
+++ b/maintainer-scripts/update_version_svn
@@ -28,10 +28,8 @@ BRANCHES="${BRANCHES} ${ADD_BRANCHES}"
 # 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
@@ -39,15 +37,15 @@ for BRANCH in $BRANCHES; do
   echo "Working on \"$BRANCH\"."
   # 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=""
 
@@ -78,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