update_version (IGNORE_BRANCHES): Add.

	* update_version (IGNORE_BRANCHES): Add.
	(BRANCHES): Do not consider branches matching $IGNORE_BRANCHES.

From-SVN: r66377

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 73ca0034342312a2123154a0d11ce8261513fd8a..991095c8027a2c83f03d7fa075f70de88d4cca5b 100644 (file)
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/maintainer-scripts/update_version b/maintainer-scripts/update_version
index afd72a38ebba368fb030c980a0186c9b1aa9238e..bde683eb8ec0a1bd1c2d1abcf565b474dbf6fa7e 100755 (executable)
--- 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"