Bug in cvsmkbranch on devel.squid-cache.org

Hi,

I the last days I have created two new Squid branches based on s2_5:
cygwin-svc-2_5 and nt-2_5, but when I try to do a cvsmerge, it doesn't work.

Looking at http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi I find
the Z-nt-2_5_merge_ and Z-nt-cygwin-svc-2_5_merge_ temp branches instead of
Z-nt-2_5_merge_s2_5 and Z-nt-cygwin-svc-2_5_merge_s2_5.

Looking on cvsmkbranch:

if [ -f CVS/Tag ]; then
     thistag=`cat CVS/Tag|cut -c2-`
else
     thistag=HEAD
fi
if [ $# == 3 ]; then
     oldbase=$2
     newbase=$3
     moved=1
else
     oldbase=$basetag <==== WRONG, it's not defined, must be thistag
     newbase=$basetag <==== WRONG, it's not defined, must be thistag
     moved=
fi
rootdir=`cat CVS/Root|sed -e 's/.*://'`
module=`cat CVS/Repository|sed -e "s!^$rootdir!!"`
branch=`echo $1|sed -e 's/\./_/g'`
workdir="../$1"
if [ -d $workdir ]; then
    echo "Error! $workdir already exists"
    exit 1
fi
cp -rp . $workdir &
mergetag="Z-${branch}_merge_${newbase}"
thismergetag="Z-${thistag}_merge_${oldbase}"

Now, is possible to rename the two wrong Z_ branches to the correct name ?

Regards

Guido

-
=======================================================
Serassio Guido
Via Albenga, 11/4 10134 - Torino - ITALY
E-mail: guido.serassio@serassio.it
WWW: http://www.serassio.it
Received on Thu Mar 14 2002 - 14:11:55 MST