[Development] Qt 6.1 Feature Freeze is in effect now

[Joerg Bornemann]

On 2/3/21 5:36 PM, Volker Hilsheimer wrote:

> Milk, Joerg.

Blame my handwriting!

> But why not get rid of the gap in the first place, ie instead of having a gap between
> 
>> - final dependency update sha1s are fixed, full update round started
>> - 6.1 branch is created
> 
> What stops us from simply creating the branch in the submodules, without caring about submodule updates? Does it matter that the fork-point itself provides a consistent set? I see how that makes some sense for the qt5.git repo, but not for the submodules.

Maybe I'm missing something, but AFAICT the problem is that the 6.1 
branch's sha1 is not known until the dependency update round was 
successful. It could take several attempts until the dependency update 
goes through.

In your scenario, what are we going to do if a branch's sha1 needs to be 
updated due to a failed dependency update and there are already 
cherry-picks? I suppose we could rebase. Who resolves the conflicts then?


BR,

Joerg