Re: VCS for squid3 development?

tor 2007-12-27 klockan 07:52 +1100 skrev Robert Collins:

> Do I have sufficient access to do this? I'm not a BSD afficiondo anyhow,
> so perhaps its best if I say 'install the bzr port' as long as its at
> version 1.0 now. (If its not we can just install by hand). Same for
> loggerhead which a trivial apache redirect can feed requests to. I'll
> get details for that together in a bit.

> > - the snapshot scripts need a little update to use the right tools for
> > checking out the source tree.
>
> The ones in the source tree itself? Otherwise point me at them, I'll
> update them.

Yes, all the important ones is in the Squid-3 source tree.

> > - the release scripts as well
>
> Ditto.

This as well.

> > - the rest is maninly a handful recipes on how to do common tasks needed
> > for Squid development.
>
> Right. Lets list them:
> - generate a patch for a commit
> - get a mirror of the development source to hack on
> - make a new branch to hack on
> - commit something which has been developed back to trunk
> - cherry pick something back to an older release using CVS
> - cherry pick something back to an older release using bzr.
> - others ?

 - bring a new branch up to date with it's ancestor
 - merge another branch into yours

and if time permits
 
 - how to generate a clean patch when having another branch merged into
yours (i.e. diff relative to an up to date version of that branch, not
your natural ancestor)

> > Most of the other VCS related "infrastructure" we have is just to work
> > around the shortcomings of CVS.
>
> Like the list of patches? We'll want to run a web gui up - I suggest
> loggerhead.

The list of patches is just cvs turned into changesets. A bzr changeset
viewer does the same job.

At some point we'll probably resurrect the old patches page used for 2.5
and earlier, but maybe not. Such page requires a little more work as
it's a list of cleaned up and annotated patches, avoiding multiple
patches when the first changeset wasn't sufficient or was broken, and
cleaned up notes directed more to users than developers..

> > But some script to mirror HEAD and STABLE branches into CVS while
> > keeping the CVS structure of things would be nice in order to continue
> > serving reasonable anoncvs read-only access. Not a requirement however.
>
> I'd *prefer* to set an expectation about a switchover time and switch &
> disable the CVS mirrors; because the higher fidelity of a VCS that does
> renames etc makes correct mirroring into CVS really annoying.

No problem. Is something which can be looked into later if needed.

Regards
Henrik
Received on Thu Dec 27 2007 - 16:19:48 MST