Re: [Squid-cvs] website index.html

Adrian Chadd wrote:

> Ok, sweet. After I've upgraded my modio branch to the latest HEAD
> I'll run off and do something with Benno's stuff on sourceforge.
> Benno, you can now bug me for CVS space while we roll this all
> together. :)

Adrian, please do not add it to the modio CVS branch. My intention is
that the shared branches should be focused to a single feature/area.
Life gets easier then when we start merging stuff into the main Squid
branch.

Steps for adding a new branch:

1. Upgrad the squid branch to the latest "official" sources (from the
CVS tree on cvs.squid-cache.org).

2. Run the attached cvsmkbranch script in a working directory from the
squid branch
3. Hack away in the newly created working directory

4. When the base branch has changed, run the attached cvsmerge script to
copy the updates to this branch.

(the above can be done on any branch, the new branch does not need to be
based on the squid branch)

If you have manually merged another branch into yours by using cvs -j
options, then the attached cvsmergeinit script can be used to set the
needed tag for future calls to cvsmerge.

/Henrik

#!/bin/sh -e
if [ $# -ne 1 ] || [ ! -f CVS/Tag ] || [ ! -f CVS/Repository ]; then
    echo "Usage: $0 branchname"
    echo ""
    echo "Creates a new branch from the current working directory"
    echo ""
    exit 1
fi
localtag=`cat CVS/Tag|cut -c2-`
repository=`cat CVS/Repository`
branch=$1
mergetag="Z-${localtag}_merge_${mergetag}"
cvs -z9 -q rtag -F -r $localtag $mergetag $repository
cvs -z9 -q rtag -F -r $mergetag -b $branch $repository
cvs -z9 co -d ../`basename $repository`-$branch/ $repository

#!/bin/sh -e
localtag=`cat CVS/Tag|cut -c2-`
repository=`cat CVS/Repository`
mergetag=$1
basetag="Z-${localtag}_merge_${mergetag}"
cvs -z9 -q rtag -F -r $mergetag ${basetag}-new $repository
cvs -z9 -q update -kk -d -P -j $basetag -j ${basetag}-new
cvs -z9 -q rtag -F -r ${basetag}-new $basetag $repository
cvs -z9 -q rtag -d ${basetag}-new $repository

#!/bin/sh -e
if [ $# -ne 2 -a $# -ne 1 ]; then
   cat <<- EOF
        usage: $0 merge_from_tag [based_on_tag]
        merge_from_tag is the tag to track in this tree
        based_on_tag is used if the merge_from_tag is based on another tag.
        if based_on_tag isn't specified then future merges starts from the
        current state of merge_from_tag.
        EOF
    exit 1
fi
localtag=`cat CVS/Tag|cut -c2-`
repository=`cat CVS/Repository`
mergetag=$1
roottag=$2
if [ -z "$roottag" ]; then
   roottag=$mergetag
fi
basetag="Z-${localtag}_merge_${mergetag}"
cvs -z9 rtag -r $roottag $basetag $repository
Received on Wed Apr 12 2000 - 16:41:40 MDT