[Development] Qt 6.1 Feature Freeze is in effect now

[Joerg Bornemann]

On 2/3/21 11:42 AM, Edward Welbourne wrote:

>>> 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.

That's the confirmation I was looking to provoke. ;-)

The thing is, even with established tools you suggested it's still 
possible to buy the wrong brand of beer, and just maybe we could improve 
the process a bit and reduce the risk of having fixes falling through 
the gaps.

And the example can be made worse. Imagine a change with Pick-to: 6.0. 
You'd end up with a fix in dev and 6.0, but not in 6.1.

> A fairly straightforward solution would be to downgrade the relevant
> 'bot's complaint against "this branch does not exist", at least when the
> branch name matches some "plausible imminent branch-name" heuristic, to a
> warning rather than a -2.

And this is very similar to the solution I was going to propose.
Even better than a heuristic would be to teach sanitary bot the concept 
of "imminent not-yet-created branch names" and tell him to not complain 
about those.

The cherry-pick bot would then be able to run after the "imminent 
not-yet-created branch" branch creation and pick handfuls of cherries in 
bulk.


BR,

Joerg