I agree with what Aidan suggested, with Alan's amendments (thanks to both).
I think this is a good start, and working on trunk I'm all in favour of !
Looking forward to some trunk-ing next week.
Bfn,
Marnie
On 6/19/08, Aidan Skinner <[EMAIL PROTECTED]> wrote:
>
> On Thu, Jun 19, 2008 at 3:35 PM, Alan Conway <[EMAIL PROTECTED]> wrote:
>
> > On Thu, 2008-06-19 at 11:11 +0100, Aidan Skinner wrote:
>
> >> When we're ready to start bug fixing / stabalising for release, we
> branch an
> >> M{N}.x and use that as a testing target. Fixes would occur on trunk and
> be
> >> merged down.
> >
> > >From past experience, I suggest fixes occur on M{N}.x and merge to
> > trunk. Since the trunk is always open, merging from trunk to a release
> > branch risks picking up changes not intended for the release.
> >
> > Another way of putting it: always merge from more stable branches
> > towards less stable branches, never the other way around.
>
> That does make more sense, lets do that. :)
>
> - Aidan
> --
> aim/y!:aidans42 g:[EMAIL PROTECTED] <[EMAIL PROTECTED]>
> http://aidan.skinner.me.uk/
> "We belong to nobody and nobody belongs to us. We don't even belong to
> each other."
>
