aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Pfeifer <pfeifer@dbai.tuwien.ac.at>2003-05-02 09:41:47 +0000
committerGerald Pfeifer <gerald@gcc.gnu.org>2003-05-02 09:41:47 +0000
commitce61bf7ba759d99356b5fcdaa2bd6883395be016 (patch)
tree04b88ecd20a918eba88ef9abd9d08d79f3a67849
parent143f596a09eb477adb10f7e710df0b4b97fa4115 (diff)
downloadgcc-ce61bf7ba759d99356b5fcdaa2bd6883395be016.zip
gcc-ce61bf7ba759d99356b5fcdaa2bd6883395be016.tar.gz
gcc-ce61bf7ba759d99356b5fcdaa2bd6883395be016.tar.bz2
update_version (IGNORE_BRANCHES): Add.
* update_version (IGNORE_BRANCHES): Add. (BRANCHES): Do not consider branches matching $IGNORE_BRANCHES. From-SVN: r66377
-rw-r--r--maintainer-scripts/ChangeLog5
-rwxr-xr-xmaintainer-scripts/update_version7
2 files changed, 10 insertions, 2 deletions
diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 73ca003..991095c 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,5 +1,10 @@
2003-05-02 Gerald Pfeifer <gerald@pfeifer@dbai.tuwien.ac.at>
+ * update_version (IGNORE_BRANCHES): Add.
+ (BRANCHES): Do not consider branches matching $IGNORE_BRANCHES.
+
+2003-05-02 Gerald Pfeifer <gerald@pfeifer@dbai.tuwien.ac.at>
+
* update_version: Add a trace of which branch we are currently
working on.
diff --git a/maintainer-scripts/update_version b/maintainer-scripts/update_version
index afd72a3..bde683e 100755
--- a/maintainer-scripts/update_version
+++ b/maintainer-scripts/update_version
@@ -1,7 +1,9 @@
#!/bin/sh
-# Run this from /tmp.
CVSROOT=${CVSROOT:-/cvs/gcc}
+IGNORE_BRANCHES='gcc-(2_95|3_0|3_1|3_2)-branch'
+
+# Run this from /tmp.
export CVSROOT
/bin/rm -rf /tmp/$$
/bin/mkdir /tmp/$$
@@ -14,7 +16,8 @@ CVS=${CVS:-/usr/local/bin/cvs}
$CVS co gcc/ChangeLog
BRANCHES=`$CVS status -v gcc/ChangeLog \
| awk '{print $1;}' \
- | egrep 'gcc-[0-9]+_[0-9]+-branch$'`
+ | egrep 'gcc-[0-9]+_[0-9]+-branch$' \
+ | egrep -v $IGNORE_BRANCHES`
# Always update the mainline.
BRANCHES="${BRANCHES} HEAD"