[Development] [HEADS UP] 5.9 now in cherry-pick mode; 5.10 closed
oswald.buddenhagen at qt.io
Mon Feb 12 14:53:36 CET 2018
this decision was executed now:
On Mon, Feb 05, 2018 at 10:35:56AM +0000, Lars Knoll wrote:
> This means we’ll go with something close to option 2b that Ossi outlined below:
> * We put 5.9 in cherry-picking mode in line with QUIP 5.
> * There is currently no 5.10.2 release planned. The main reason to do one would be to be an urgent security update. This means we also leave 5.10 branch behind and close it.
> * If we have a larger security issue that deserves a release (and not just a patch) from 5.10, we can still do that from the branch on top of 5.10.1 (maybe doing a one time merge from 5.9 to 5.10 if we want those fixes as well)
> * Instead we put our focus on getting 5.11 out as quickly as we can. Let’s branch now, create first alpha and then beta packages as quickly as possible. Not having to merge from 5.10 will ease this significantly. Getting 5.11 out quick will hopefully also make Webengine not fall too far/long behind upstream security patches.
> Of course, we continue having regular releases from 5.9, but with it being in strict mode, the frequency of releases will maybe drop a bit (from every 6 weeks currently to maybe every 8-10 weeks). Let’s also now plan for at least two patch level releases of 5.11 before 5.12 comes out.
there will be final forward merges from 5.10 and 5.9 to 5.11 still, so
don't cherry-pick anything just yet. only if your commits to 5.9 don't
show up on 5.11 in a few days, you need to forward-pick them. new and
not yet integrated fixes should go to 5.11 and be picked to 5.9 if
necessary, after we announce the completion of the final merges. picks
to 5.6 should be done from 5.9 only, which means two levels of picking
(please remove the first pick footer before pushing).
More information about the Development