Last merge from master -> 4.13 is done. From now on master branch is 4.14. Merges from 4.13 to master are done as usual.
Qt Creator 4.13 * Feature freeze wk27 (~ Jun 30 2020) * Beta release wk29 (~ Jul 14 2020) * String freeze wk31 (~ Jul 28 2020) * RC release wk33 (~ Aug 11 2020) * Final release wk35 (~ Aug 25 2020) https://wiki.qt.io/Qt_Creator_Releases Br, Eike > On Jun 30, 2020, at 09:33, Eike Ziller <eike.zil...@qt.io> wrote: > > > >> On Jun 30, 2020, at 06:17, Orgad Shaneh <org...@gmail.com> wrote: >> >> Hi, >> >> Upward merges are done once in a while (4.12 -> 4.13 -> master). >> >> Usually during 2 weeks following feature freeze, > > That is 1 week _before_ feature freeze, though I’ve started shortening that a > bit, since we nowadays have the “Move change” feature which makes that period > less necessary. > >> the newly created branch and master are merged in both directions to keep >> them synchronized (4.13 <-> master). After that, master becomes the next >> release (4.14), and it keeps getting merges from 4.13. > > At the end of today / tomorrow morning I’ll do a final merge master -> 4.13, > and after that feature freeze will be in effect. Merges from 4.13 -> master > will still happen until 4.13 is completely closed for content. > >> בתאריך יום ג׳, 30 ביוני 2020, 1:06, מאת jeandet >> <alexis.jean...@member.fsf.org>: >> Hello, >> >> Might be a stupid question, sorry for that :). If I pushed something to >> 4.13 today, is it only for 4.13 or will it be also into master? >> I think I misunderstood, I might have targeted 4.13 with stuff that should >> also be in master. > > Everything in 4.13 will (after some time) end up in master. > > >> Best regards, >> Alexis. >> On Fri, 2020-06-26 at 11:50 +0000, Eike Ziller wrote: >>> 4.13 branches have been created. >>> Please start pushing patches for 4.13. >>> You can re-target a change in Gerrit to a different branch by clicking the >>> “...” menu in the topic row at the top-right (next to “Edit”), and >>> selecting “Move change”. >>> >>> Br, Eike >>> >>>> On Jun 23, 2020, at 09:12, Eike Ziller <eike.zil...@qt.io> wrote: >>>> >>>> Qt Creator 4.13 feature freeze is planned for next week: >>>> >>>> * Feature freeze wk27 (~ Jun 30 2020) >>>> * Beta release wk29 (~ Jul 14 2020) >>>> * String freeze wk31 (~ Jul 28 2020) >>>> * RC release wk33 (~ Aug 11 2020) >>>> * Final release wk35 (~ Aug 25 2020) >>>> >>>> https://wiki.qt.io/Qt_Creator_Releases >>>> >>>> I’ll create the 4.13 branch(es) on Thursday. >>>> The master branch will still be merged into the 4.13 branch until feature >>>> freeze next Tuesday. >>>> After that, the master branch will become 4.14. >>>> >>>> Br, Eike >>>> >>>> -- >>>> Eike Ziller >>>> Principal Software Engineer >>>> >>>> The Qt Company GmbH >>>> Erich-Thilo-Straße 10 >>>> D-12489 Berlin >>>> eike.zil...@qt.io >>>> http://qt.io >>>> Geschäftsführer: Mika Pälsi, >>>> Juha Varelius, Mika Harjuaho >>>> Sitz der Gesellschaft: Berlin, Registergericht: Amtsgericht >>>> Charlottenburg, HRB 144331 B >>>> >>>> _______________________________________________ >>>> Qt-creator mailing list >>>> Qt-creator@qt-project.org >>>> https://lists.qt-project.org/listinfo/qt-creator >>> >>> -- >>> Eike Ziller >>> Principal Software Engineer >>> >>> The Qt Company GmbH >>> Erich-Thilo-Straße 10 >>> D-12489 Berlin >>> eike.zil...@qt.io >>> http://qt.io >>> Geschäftsführer: Mika Pälsi, >>> Juha Varelius, Mika Harjuaho >>> Sitz der Gesellschaft: Berlin, Registergericht: Amtsgericht Charlottenburg, >>> HRB 144331 B >>> >>> _______________________________________________ >>> Qt-creator mailing list >>> Qt-creator@qt-project.org >>> https://lists.qt-project.org/listinfo/qt-creator >> _______________________________________________ >> Qt-creator mailing list >> Qt-creator@qt-project.org >> https://lists.qt-project.org/listinfo/qt-creator >> _______________________________________________ >> Qt-creator mailing list >> Qt-creator@qt-project.org >> https://lists.qt-project.org/listinfo/qt-creator > > -- > Eike Ziller > Principal Software Engineer > > The Qt Company GmbH > Erich-Thilo-Straße 10 > D-12489 Berlin > eike.zil...@qt.io > http://qt.io > Geschäftsführer: Mika Pälsi, > Juha Varelius, Mika Harjuaho > Sitz der Gesellschaft: Berlin, Registergericht: Amtsgericht Charlottenburg, > HRB 144331 B > > _______________________________________________ > Qt-creator mailing list > Qt-creator@qt-project.org > https://lists.qt-project.org/listinfo/qt-creator -- Eike Ziller Principal Software Engineer The Qt Company GmbH Erich-Thilo-Straße 10 D-12489 Berlin eike.zil...@qt.io http://qt.io Geschäftsführer: Mika Pälsi, Juha Varelius, Mika Harjuaho Sitz der Gesellschaft: Berlin, Registergericht: Amtsgericht Charlottenburg, HRB 144331 B _______________________________________________ Qt-creator mailing list Qt-creator@qt-project.org https://lists.qt-project.org/listinfo/qt-creator