From 61a03692ab84504fb2bd85b71facfe0f6456b466 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 17 May 2005 00:45:16 +0000
Subject: [PATCH] use "cvs log -h"

---
 util/update_branches | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/util/update_branches b/util/update_branches
index 333e15f151..70fb8771c5 100644
--- a/util/update_branches
+++ b/util/update_branches
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: update_branches,v 1.9 2005/05/16 23:38:45 marka Exp $
+# $Id: update_branches,v 1.10 2005/05/17 00:45:16 marka Exp $
 
 #
 #  Track which branches are still open or not in the bind9 cvs repository.
@@ -74,13 +74,21 @@ while (<FILES>) {
 	chomp;
 	# print "file: $_\n"; # debug
 	# $file = $_; # save for branch debug below.
-	open(FILE, "<$_") || die "can't open $_: $!";
+	s:/proj/cvs/prod/bind9/::;
+	s:/Attic/([^/]*)$:/$1:;
+	s:^Attic/([^/]*)$:$1:;
+	s:,v$::;
+	#
+	# use cvs so that the file is locked.
+	#
+	open(FILE, "cvs log -h $_|") || die "can't start cvs log -h $_: $!";
 	while (<FILE>) {
 		chomp;
 		next unless m/^symbols$/;	# skip until we find the tags
 		while (<FILE>) {
 			chomp;
 			last if (m/^locks;/);	# we are past the tags
+			last if (m/^keyword/);	# we are past the tags
 			next unless m/\.0\.\d$/; # skip if not a branch
 			s/\s(.*):.*/$1/;	# extract label
 			if (!$branches{$_}) {