diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2015-04-13 11:07:11 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2015-04-13 11:07:11 +0200 |
| commit | 54a3a620046c47bfda0deb529cf3c4284561ce8a (patch) | |
| tree | 547172486a051f5b2192cf50537c33ebf0895e64 /maintainer-scripts | |
| parent | d041a6fcae6d87a98d86efdc8ebe384192236f98 (diff) | |
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
Diffstat (limited to 'maintainer-scripts')
| -rw-r--r-- | maintainer-scripts/ChangeLog | 3 | ||||
| -rwxr-xr-x | maintainer-scripts/update_version_svn | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog index 2f7e2271586..8449a9dd3fa 100644 --- 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 800a70e8946..c707acaba06 100755 --- 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}" |