[Development] Qt 6.1 Feature Freeze is in effect now

[Joerg Bornemann]

On 2/4/21 12:20 PM, Volker Hilsheimer wrote:

> The 6.1 branch’s sha1 is whatever the sha1 in dev was when the branch was created. Things start to diverge from there, but at branching sha1, the new branch’s consistent set is whatever .qtmodules and dependencies.yaml states at that time. Does it matter whether .gitmodules points to the HEAD of that new branch? I suppose not, we are not releasing yet. If we release, we’d basically release dev’s last consistent set.
> 
> Then we cherry-pick changes into the new branch, and do the usual submodule process for that new branch. Eventually, we will have a consistent set again for the branch.
> 
> Some times, cherry-picks will break dependencies, and then we don’t have a consistent set. That’s the same situation, isn’t it?

Right, I was missing that you want to do the submodule update rounds for 
the 6.x branch instead of dev. I suppose that would work. To summarize, 
the process would be:

- branch off 6.x in all repos from whatever is currently is dev
- do submodule update rounds for 6.x
- needed fixes for submodule updates go into 6.x with Pick-to: dev

I like the simplicity. No bot fiddling and no "imminent not-yet-created 
branch" concept.


Cheers,

Joerg