Re: [Squid-cvs] website index.html

On Thu, Apr 13, 2000, Henrik Nordstrom wrote:
> 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.

Doh. I forgot to add 'Create a new branch' in there. I wasn't going to
merge his code into my modio branch, except perhaps for the read/write
overloading in the fdtable struct.

> 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.

Ta. I'll keep it in mind.

Adrian
Received on Wed Apr 12 2000 - 16:46:30 MDT