[Development] Qt 6.1 Feature Freeze is in effect now

[Volker Hilsheimer]

> On 3 Feb 2021, at 09:31, Joerg Bornemann <Joerg.Bornemann at qt.io> wrote:
> 
> On 2/1/21 1:34 PM, Jani Heikkinen wrote:
> 
>> Qt 6.1 Feature Freeze is in effect now. So please do not add any new features, API changes ect in 'dev' anymore until we have done branching from 'dev' to '6.1'. We are trying to do branching from 'dev' to '6.1' as soon as possible but at first we need to get full dependency update round done.
> 
> Let's say I have a change for qtbase's dev branch that is supposed to be cherry-picked to 6.1. What happens if this change hits qtbase between those two points in time:
> 
> - final dependency update sha1s are fixed, full update round started
> - 6.1 branch is created
> 
> The change in question cannot have the Pick-to: 6.1 footer, because the branch does not exist. How can I avoid to forget cherry-picking that change, once 6.1 is in place?


Yes, that’s a risk with cherry-pick mode.

Use whatever tool you use to avoid that you forget to buy milk, and do a manual cherry-pick if your change fell into that (hopefully short) window.

Jani, perhaps it would be useful to tag the commit at which branches start? That would allow us to search for commits that fall into that window (although perhaps there’s some git wizardry for that).

Volker