update_version_svn: Update DATESTAMP also on branches/gcc-[0-9]+-branch.

	* update_version_svn: Update DATESTAMP also on
	branches/gcc-[0-9]+-branch.

From-SVN: r222044

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 2f7e2271586b7115e8f00ff66c369005e1448f2f..8449a9dd3fa831907e2e67dabfbb2118ebe9f9cc 100644 (file)
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,5 +1,8 @@
 2015-04-13  Jakub Jelinek  <jakub@redhat.com>
 
+       * update_version_svn: Update DATESTAMP also on
+       branches/gcc-[0-9]+-branch.
+
        * gcc_release: Fix up thinko in the last commit, improve error
        message.  Commit all ChangeLog, DEV-PHASE and BASE-VER changes
        together, rather than doing dozens of separate commits.

diff --git a/maintainer-scripts/update_version_svn b/maintainer-scripts/update_version_svn
index 800a70e8946d49d103d109d0ee7f83c3a49cea8a..c707acaba06b399f907b56b6df8748bc12192fce 100755 (executable)
--- a/maintainer-scripts/update_version_svn
+++ b/maintainer-scripts/update_version_svn
@@ -20,7 +20,7 @@ SVN=${SVN:-/usr/bin/svn}
 # Compute the branches which we should update.
 BRANCHES=`$SVN ls $SVNROOT/branches \
          | sed -e 's/\///' \
-          | egrep 'gcc-[0-9]+_[0-9]+-branch$' \
+          | egrep 'gcc-[0-9]+(_[0-9]+)?-branch$' \
           | egrep -v $IGNORE_BRANCHES`
 # Always update the mainline.
 BRANCHES="${BRANCHES} ${ADD_BRANCHES}"