[Development] On Pick-to: and QUIP-16

[Marc Mutz]

On 17.03.25 08:10, Jörg Bornemann wrote:
> On 3/14/25 5:49 PM, Marc Mutz via Development wrote:
> 
>> TL;DR: do _not_ approve patches that do not "pick-to:" according to
>> QUIP-16 or explain in the commit message why they deviate.
> 
> This reads as if QUIP-16 would require us cherry-picking to a lower branch.
> The wording, however, is:
> 
> "Changes that qualify for a stable, strict, or release branch *may* be 
> cherry-picked into those branches once the merge into dev is completed."

Ok, so this is again one of the rules which is formulated so wishy-washy 
that it becomes a problem in itself.

> Therefore, I have to disagree with your statement.

I still think the guideline we gave ourselves should be the baseline, 
and deviations from it should be argued in the commit message. And 
unless reviewers start asking for it, it won't happen.

→ https://codereview.qt-project.org/c/meta/quips/+/632133

Thanks,
Marc

-- 
Marc Mutz <marc.mutz at qt.io> (he/his)
Principal Software Engineer

The Qt Company
Erich-Thilo-Str. 10 12489
Berlin, Germany
www.qt.io

Geschäftsführer: Mika Pälsi, Juha Varelius, Jouni Lintunen
Sitz der Gesellschaft: Berlin,
Registergericht: Amtsgericht Charlottenburg,
HRB 144331 B