On Thu, 11 Nov 1999, Kendall Bennett wrote:
> Forwarded message:
> From: Self <KendallB>
> To: Brian Paul <[EMAIL PROTECTED]>
> Subject: Re: [Mesa-dev] branching plans
> Date: Wed, 10 Nov 1999 19:41:16 -0800
>
> Hi Brian,
>
> > I plan on creating the 3.2 development branch today.
> > The branch tag will be mesa_3_2_dev.
> > When Mesa 3.1 is released I'll tag that branch's sources mesa_3_1.
> > When Mesa 3.2 is released I'll tag that branch's sources mesa_3_2.
>
> Ok. I just checked in a bunch of changes into the 3.1 development
> branch that I would like to see in the 3.2 branch. How do we go about
> merging those changes between the two branches? Then I will continune
> working in the 3.2 branch for the time being (as we are trying to get
> a stable build together for the MGL 5.0 release).
With most projects that work with the ODD/EVEN version number scheme,
you would not create a 3.2 until 3.1 had been officially released.
On that day, you'd bulk copy 3.1 into 3.2, lock 3.1 in a closet
somewhere and promise not to change it ever again.
After that point, new code goes into 3.3 - and only bug fixes
are applied to 3.2.
Hence you should never have to add code piecemeal from 3.1 to 3.2,
only ever from 3.3 to 3.2 - and only in the case of bug fixes.
...well, that's the way *other* projects work.
Steve Baker (817)619-2657 (Vox/Vox-Mail)
Raytheon Systems Inc. (817)619-2466 (Fax)
Work: [EMAIL PROTECTED] http://www.hti.com
Home: [EMAIL PROTECTED] http://web2.airmail.net/sjbaker1
_______________________________________________
Mesa-dev maillist - [EMAIL PROTECTED]
http://lists.mesa3d.org/mailman/listinfo/mesa-dev
