[Development] Temporarily preventing changes being staged in the dev branch of qtquickcontrols2

[Lars Knoll]

> On 27 Jul 2021, at 07:19, Jani Heikkinen <jani.heikkinen at qt.io> wrote:
> 
>> -----Original Message-----
>> From: Mitch Curtis <mitch.curtis at qt.io>
>> Sent: perjantai 23. heinäkuuta 2021 17.12
>> To: Alexandru Croitor <alexandru.croitor at qt.io>
>> Cc: development at qt-project.org; Qt Releases <qt.releases at qt.io>
>> Subject: Re: [Development] Temporarily preventing changes being staged in
>> the dev branch of qtquickcontrols2
>> 
>> Thanks for bringing this up. It's a good point I hadn't thought about. I wonder
>> if it's too late to do the merge in 6.2 instead... that would save a lot of hassle
>> in the long term.
> 
> 
> Well, this kind of changes should have been done before FF. But on the other hand doing this change should help us to keep dependency updates more stable instead. I can't see this causing big risks for Qt 6.2 schedule either and I agree doing this also in 6.2 would make things easier in the future. So I am not against this change if we are really sure this won't cause delays to the 6.2.0 release. But of course it is Lars who needs to approve this change in '6.2'.

If we merge those repos, we should really do it for 6.2 as well. Otherwise, we’re making it unnecessarily hard to work with bug fixes that need to go into 6.2.

So fine for me to do the merge in both 6.2 and dev.

Cheers,
Lars

> 
> br,
> Jani Heikkinen
> Release Manager
> 
> 
> 
>> 
>> On 23/7/21, 4:02 pm, "Alexandru Croitor" <alexandru.croitor at qt.io> wrote:
>> 
>>    Hi
>> 
>>> On 20/7/21, 2:10 pm, "Development on behalf of Mitch Curtis"
>> <development-bounces at qt-project.org on behalf of mitch.curtis at qt.io>
>> wrote:
>>> 
>>>   Hi.
>>> 
>>>   I'd like to request that we temporarily prevent changes from being
>> staged in the dev branch of qtquickcontrols2 in preparation for merging it
>> into qtdeclarative, as otherwise changes could be missed in the merge.
>>> 
>>>   I'm sending this to both the release team and the development mailing
>> list as a heads up.
>>> 
>> 
>>    As i understand the current intention is to merge qtquickcontrols2 dev
>> branch into qtdeclarative dev branch, which is Qt 6.3 at the moment.
>> 
>>    That leaves qtuickcontrols2 and qtdeclarative separate in 6.2 LTS branch.
>> 
>>    The current cherry-pick bot can't handle cross-repo cherry-picks.
>> 
>>    Which means any qqc2 code changes in qtdeclarative repo 6.3, 6.4, 6.5,
>> branch will have to be replicated with a more manual process to 6.2 branch of
>> qtquickcontrols2 repo, because 6.2 is LTS.
>> 
>>    Can these cherry-picks be done automatically somehow? Is the manual
>> process the one we want / are stuck with?
>> 
>>    Is this enough justification to do the qqc2 -> qtdeclarative merge in 6.2
>> branch instead?
> 
> _______________________________________________
> Development mailing list
> Development at qt-project.org
> https://lists.qt-project.org/listinfo/development