From: Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
Date: Fri, 2 May 2003 09:41:47 +0000 (+0000)
Subject: update_version (IGNORE_BRANCHES): Add.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ce61bf7ba759d99356b5fcdaa2bd6883395be016;p=gcc.git

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 73ca0034342..991095c8027 100644
--- 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 afd72a38ebb..bde683eb8ec 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"