summaryrefslogtreecommitdiff
path: root/maintainer-scripts
diff options
context:
space:
mode:
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2015-04-13 09:07:11 +0000
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2015-04-13 09:07:11 +0000
commit76541bb59f847a7cbece949279d06e66e949f1b9 (patch)
tree547172486a051f5b2192cf50537c33ebf0895e64 /maintainer-scripts
parente0965b31a3eb3e96403e46cb797d27e9ae141310 (diff)
downloadgcc-76541bb59f847a7cbece949279d06e66e949f1b9.tar.gz
* update_version_svn: Update DATESTAMP also on
branches/gcc-[0-9]+-branch. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222044 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'maintainer-scripts')
-rw-r--r--maintainer-scripts/ChangeLog3
-rwxr-xr-xmaintainer-scripts/update_version_svn2
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}"