Re: [Development] [Gerrit-admin] Cherry-pick mode for 5.12
One week after previous reply. I had done the full round of 5.12.5->5.12 merges and most of 5.12->5.13 merges including qt5 and submodules except following: * https://codereview.qt-project.org/c/qt/qtdeclarative/+/273211 * https://codereview.qt-project.org/c/qt/qttranslations/+/266633 If you found anything else is missing, please let me know, thanks. I think 5.12 could be full cherry-pick mode now. To provisioning change owners, please do in 5.13 branch first and then cherry-pick to 5.12 if needed. —Liang > On 3 Sep 2019, at 07:53, Liang Qi wrote: > > It happened so fast this time. > > But 5.12.5 was branched out before this cherry-pick mode change on 5.12 > branch, I plan to do the 5.12.5->5.12->5.13 merges after 5.12.5 is out. Is it > OK? > > —Liang > >> On 2 Sep 2019, at 15:13, Kari Oikarinen wrote: >> >> >> >> On 2.9.2019 15.23, Lars Knoll wrote: >>> Hi all, >>> >>> According to QUIP-5 (http://quips-qt-io.herokuapp.com/quip-0005.html), we >>> should move the 5.12 branch into cherry-pick mode now that we have created >>> the 5.14 branch. >>> >>> Gerrit admins, could you please do the required changes in gerrit and for >>> the sanity bot? Let’s do one final down-merge of 5.12 to 5.13 once that’s >>> done. >>> >> >> Sanity bot should now recognize 5.12 as an LTS branch and not complain about >> cherry-picks there. >> >> -- >> Kari >> ___ >> Development mailing list >> Development@qt-project.org >> https://lists.qt-project.org/listinfo/development > ___ Development mailing list Development@qt-project.org https://lists.qt-project.org/listinfo/development
Re: [Development] [Gerrit-admin] Cherry-pick mode for 5.12
> On 3 Sep 2019, at 09:12, Allan Sandfeld Jensen wrote: > > On Tuesday, 3 September 2019 07:53:29 CEST Liang Qi wrote: >> It happened so fast this time. >> >> But 5.12.5 was branched out before this cherry-pick mode change on 5.12 >> branch, I plan to do the 5.12.5->5.12->5.13 merges after 5.12.5 is out. Is >> it OK? > > That sounds good. Otherwise we might need to cherry-pick up. Yes, we’ll need to make sure everything that was committed before we entered cherry-pick mode is merged. Cheers, Lars ___ Development mailing list Development@qt-project.org https://lists.qt-project.org/listinfo/development
Re: [Development] [Gerrit-admin] Cherry-pick mode for 5.12
On Tuesday, 3 September 2019 07:53:29 CEST Liang Qi wrote: > It happened so fast this time. > > But 5.12.5 was branched out before this cherry-pick mode change on 5.12 > branch, I plan to do the 5.12.5->5.12->5.13 merges after 5.12.5 is out. Is > it OK? That sounds good. Otherwise we might need to cherry-pick up. 'Allan ___ Development mailing list Development@qt-project.org https://lists.qt-project.org/listinfo/development
Re: [Development] [Gerrit-admin] Cherry-pick mode for 5.12
It happened so fast this time. But 5.12.5 was branched out before this cherry-pick mode change on 5.12 branch, I plan to do the 5.12.5->5.12->5.13 merges after 5.12.5 is out. Is it OK? —Liang > On 2 Sep 2019, at 15:13, Kari Oikarinen wrote: > > > > On 2.9.2019 15.23, Lars Knoll wrote: >> Hi all, >> >> According to QUIP-5 (http://quips-qt-io.herokuapp.com/quip-0005.html), we >> should move the 5.12 branch into cherry-pick mode now that we have created >> the 5.14 branch. >> >> Gerrit admins, could you please do the required changes in gerrit and for >> the sanity bot? Let’s do one final down-merge of 5.12 to 5.13 once that’s >> done. >> > > Sanity bot should now recognize 5.12 as an LTS branch and not complain about > cherry-picks there. > > -- > Kari > ___ > Development mailing list > Development@qt-project.org > https://lists.qt-project.org/listinfo/development ___ Development mailing list Development@qt-project.org https://lists.qt-project.org/listinfo/development
Re: [Development] [Gerrit-admin] Cherry-pick mode for 5.12
On 2.9.2019 16.27, Edward Welbourne wrote: > On 2.9.2019 15.23, Lars Knoll wrote: >>> According to QUIP-5 >>> (http://quips-qt-io.herokuapp.com/quip-0005.html), we should move the >>> 5.12 branch into cherry-pick mode now that we have created the 5.14 >>> branch. >>> >>> Gerrit admins, could you please do the required changes in gerrit and >>> for the sanity bot? Let’s do one final down-merge of 5.12 to 5.13 >>> once that’s done. > > Kari Oikarinen (2 September 2019 15:13) replied: >> Sanity bot should now recognize 5.12 as an LTS branch and not complain >> about cherry-picks there. > > ... and complain about non-cherry-picks there. > (It's just done so to me, for a change that was already underway.) > > Eddy. > True, it's an awkward transition period. But you can of course override the bot's verdict. As long as the change gets in before the final merge. As soon as the risk of missing the merge is high, the bot is actually right and it's better to retarget to 5.13. -- Kari ___ Development mailing list Development@qt-project.org https://lists.qt-project.org/listinfo/development
Re: [Development] [Gerrit-admin] Cherry-pick mode for 5.12
On 2.9.2019 15.23, Lars Knoll wrote: >> According to QUIP-5 >> (http://quips-qt-io.herokuapp.com/quip-0005.html), we should move the >> 5.12 branch into cherry-pick mode now that we have created the 5.14 >> branch. >> >> Gerrit admins, could you please do the required changes in gerrit and >> for the sanity bot? Let’s do one final down-merge of 5.12 to 5.13 >> once that’s done. Kari Oikarinen (2 September 2019 15:13) replied: > Sanity bot should now recognize 5.12 as an LTS branch and not complain > about cherry-picks there. ... and complain about non-cherry-picks there. (It's just done so to me, for a change that was already underway.) Eddy. ___ Development mailing list Development@qt-project.org https://lists.qt-project.org/listinfo/development
Re: [Development] [Gerrit-admin] Cherry-pick mode for 5.12
On 2.9.2019 15.23, Lars Knoll wrote: > Hi all, > > According to QUIP-5 (http://quips-qt-io.herokuapp.com/quip-0005.html), we > should move the 5.12 branch into cherry-pick mode now that we have created > the 5.14 branch. > > Gerrit admins, could you please do the required changes in gerrit and for the > sanity bot? Let’s do one final down-merge of 5.12 to 5.13 once that’s done. > Sanity bot should now recognize 5.12 as an LTS branch and not complain about cherry-picks there. -- Kari ___ Development mailing list Development@qt-project.org https://lists.qt-project.org/listinfo/development
