[boost] Re: Changes to release procedure

From: Remy Blank (remy.blank_at_[hidden])
Date: 2002-10-02 07:44:44

On Wed, 2 Oct 2002 09:58:51 +0100, Anthony Williams <anthwil_at_[hidden]> wrote:
> Markus Sch=F6pflin writes:
>  > David Abrahams wrote:
>  > >=20
>  > > From: "Markus Sch=F6pflin" <markus.schoepflin_at_[hidden]>
>  > >=20
>  > > > David Abrahams wrote:
>  > > >
>  > > > > I'd like to propose the following changes:
>  > > > >
>  > > > > 1. The entire release candidate branch should be tagged with
>  > > > > RC_whatever_last_merge immediately after the branch is created. =
> That
>  > > can be
>  > > > > a big help when multiple changes need to be merged back into the=
>  trunk,
>  > > > > because you can just do:
>  > > > >
>  > > > >     cd $BOOST_ROOT
>  > > > >     cvs update -jRC_whatever_last_merge -jRC_whatever
>  > > >
>  > > > Doesn't the flag -f do what you want event without tagging the rel=
> ease
>  > > > branch after creation?
>  > > >
>  > > > cvs update -f -jRC_whatever_last_merge -jRC_whatever
>  > >=20
>  > > I don't know, does it?
>  >=20
>  > Maybe a cvs guru can shed some light on this... Anyone out there?
> 
> I am not a CVS guru, but to quote from the cederqvist on update options:
> 
> "-f Only useful with the "-D date" or "-r tag" flags. If no matching revi=
> sion
> is found, retrieve the most recent revision (instead of ignoring the file=
> )."
> 
> "cvs update -jRC_whatever" merges the revisions from where the RC_whateve=
> r
> branch forked from the trunk into your current sandbox. Multiple merges f=
> rom
> the same branch will create conflicts, unless you use two -j options,
> like.....=20
> 
> Dave's suggestion of using an "RC_whatever_last_merge" tag has the advant=
> age
> that you can merge more than once from the same branch, provided you move=
>  the
> tag after each merge. This looks like a good idea to me.

I've been doing this for some time in the company I'm working for, and it
proves to work quite efficiently. You just have to be careful when moving
the "last merge" tag, as tags have no history (no way back in case of error).

The following page describes the procedure (chapters 6 & 7):

http://www.tldp.org/REF/CVS-BestPractices/html/index.html

--Remy