[Development] Bug fixes to Stable or Dev branch?

[Gladhorn Frederik]

We have the branch model to make it easy to choose the right branch, usually without worrying about the releases too much.

"Normal" bug fixes go always to stable.
Stable is guaranteed to be merged into dev before the next release, so you'll never have to worry, no patch gets lost.

Show stoppers just before the release might have to go into the release branch, this should really be the exception.

Sometimes a bug is less critical and/or involves huge changes, these may have to go into the dev branch pending the approvers and your judgement.

By the way, I heard quite a few requests for more patch releases, maybe we should aim for 5.2.2 with hopefully only stability improvements.

Greetings,
Frederik

________________________________________
From: development-bounces+frederik.gladhorn=digia.com at qt-project.org [development-bounces+frederik.gladhorn=digia.com at qt-project.org] on behalf of Giuseppe D'Angelo [dangelog at gmail.com]
Sent: Wednesday, February 05, 2014 4:19 PM
To: jlayt at kde.org
Cc: development at qt-project.org
Subject: Re: [Development] Bug fixes to Stable or Dev branch?

On 5 February 2014 15:55, John Layt <jlayt at kde.org> wrote:
> Hi,
>
> I've seeing contradictory advice on Gerrit as to which branch to push bug-
> fixes to, some say there will be no 5.2.2 so to use dev instead, others say to
> keep using stable in case there is.  What is the current "official" policy?
>
> Oh, and please remember when making such decisions to clearly communicate them
> to this list, not everyone is in the office or on IRC.

The policy didn't change, see "Where to push a change?"

http://qt-project.org/wiki/Branch-Guidelines

It doesn't matter that 5.2.2 is not planned. If the change qualifies
for stable, push it to stable.

--
Giuseppe D'Angelo
_______________________________________________
Development mailing list
Development at qt-project.org
http://lists.qt-project.org/mailman/listinfo/development