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 Tue, 24 Jun 2008 09:04:27 GMT
On Mon, Jun 23, 2008 at 10:20 PM, Alan Conway <aconway@redhat.com> wrote:

> On Mon, 2008-06-23 at 10:24 +0100, Aidan Skinner wrote:

> > That probably
> > implies that non-critical bug fixes during the freeze for M{N}.x are applied
> > to trunk and then merged down after the freeze, which is a little odd since
> > merges can then happen in either direction, depending on what state the
> > branch is deemed to be in when the fix is made.
>
> Don't do that. Never ever EVER merge from a less stable branch to a more
> stable one. During the release cycle every fix needs to be evaluated as
> to whether it's a fix that should go in the release or not. If it should
> go in the release, do it on the release branch then merge to trunk. If
> not, do it on trunk where it will never be merged to this release.

What do we do in the case where it's not necessary for M{N}.x, but is
desireable for both trunk and for M{N}.x+1?

- 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