[Development] [Releasing] HEADS UP: Qt 5.4 feature freeze - branch created

[Иван Комиссаров]

Иван Комиссаров

10 авг. 2014 г., в 12:58, Oswald Buddenhagen <oswald.buddenhagen at digia.com> написал(а):

> On Sat, Aug 09, 2014 at 09:26:34PM -0300, Thiago Macieira wrote:
>> On Saturday 09 August 2014 17:12:43 Thiago Macieira wrote:
>>> On Saturday 09 August 2014 21:39:03 Oswald Buddenhagen wrote:
>>>> the 5.4 branch was created now.
>>>> 
>>>> i'll collect the re-targeting requests over the rest of the weekend
>>>> before doing the first batch, so don't get impatient just because
>>>> there is no instant effect.
>>> 
>>> Considering the QVolumeInfo change is still on dev, I assume you'll move 5.4
>>> to match dev once it integrates.
>> 
>> I guess not.
>> 
> correct.
> 
>> Not only is there a commit in dev that can't be in 5.5 (the "Bump
>> version" commit), dev doesn't compile because of this commit. The
>> commit has no "reviewed-by", so it was not reviewed by anyone.
>> 
> it's an automated direct push, which we (sergio and me, mostly) agreed
> upon due to the hassle that doing it manually and integrating it in 30
> repos causes.
> it already worked fine for the 5.3.1 branching.
> clearly, de59f74282e1e5b has thrown a monkey wrench between the gears of
> this. i could automate that as well, or qtbase needs to get excluded
> from the auto-bumping for minor versions.
> 
>> Would someone terribly mind removing that commit from dev? Please reset it to 
>> the current 5.4 branch tip
>> 
> done and replaced by https://codereview.qt-project.org/91851
> 
>> so we can continue integrations in dev, as agreed upon by Lars email
>> ("Feature Freeze Exception Request for QVersionNumber and QVolumeInfo"
>> he said "Yes, you still have the weekend").
>> 
> lars' statement has no implications for the execution of the branching
> procedure.
> dev is closed for 5.4 changes. there is no discussion about that.
> pending retargeting requests will be executed around 6pm CEST, which
> will include QVolumeInfo.
> 
> note that there seems to be a "minor" problem with CI ... integrations
> on 5.4 never start. QA needs to fix that.

Do i understand correctly we're waiting for that "minor" problem to be fixed before moving changeset to 5.4 branch?