From aa2d4b02ae02396b7432b8c3f9cbf40693fa7e35 Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Tue, 14 Oct 2003 12:08:10 +0000
Subject: [PATCH] get branch from CVS/Tag

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13013 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 make-release | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/make-release b/make-release
index 26c1fb900..b91f3f02c 100755
--- a/make-release
+++ b/make-release
@@ -13,12 +13,14 @@ fi
 
 if [ "$2" != "" ]; then
 	rev="-r $2"
+elif [ -f CVS/Tag ]; then
+	rev="-r `cat CVS/Tag | sed 's/^T//'`"
 fi
 
 HV="$1" emacs -batch -q -no-site-file -l ./make-release.el || exit
 
 echo cvs ci -m \"Release $1\" configure.in ChangeLog
 cvs ci -m "Release $1" configure.in ChangeLog || exit 1
-v=`echo $1 | sed 's/\([0-9]\)\./\1-/g'`
-echo cvs rtag $rev heimdal-$v heimdal
-cvs rtag $rev heimdal-$v heimdal || exit 1
+v=`echo $1 | sed 's/\([0-9][0-9]*\)\./\1-/g'`
+echo cvs -q rtag -F $rev heimdal-$v heimdal
+cvs -q rtag -F $rev heimdal-$v heimdal || exit 1