qpid-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Aidan Skinner" <ai...@apache.org>
Subject Re: Source management for releases
Date Thu, 19 Jun 2008 14:45:10 GMT
On Thu, Jun 19, 2008 at 3:35 PM, Alan Conway <aconway@redhat.com> 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:aidan.skinner@gmail.com
http://aidan.skinner.me.uk/
"We belong to nobody and nobody belongs to us. We don't even belong to
each other."

Mime
View raw message