Cherry-picking policy

Nate Graham nate at kde.org
Wed Nov 16 16:59:10 GMT 2022


No objections, seems like a really good idea.

I am *highly* in favor of a bot to do this automatically in response to 
the presence of the "cherry-pick" label and appropriate milestone to 
cherry-pick to being defined, which would also help with people 
remembering to do those things.

Nate



On 11/16/22 03:11, Vlad Zahorodnii wrote:
> Hi,
> 
> At the moment, we have the following bugfixing workflow in plasma:
> 
> * fix a bug in master
> * cherry pick the fix to stable branch(es)
> 
> The last step is usually done without creating a MR. If there is a merge 
> conflict, some people do create a MR though.
> 
> I propose to make creating MRs for bugfix backports mandatory:
> 
> - this helps us to ensure that CI is happy
> - increases the visibility of what happens in stable branches. For 
> example some people help with backporting bugfixes, but they can forget 
> to include a commit if the original MR included multiple commits. 
> Hopefully, this can help us to catch these cases
> 
> Ideally this should be automated, but we have no tooling to do that.
> 
> Thoughts?
> 
> Regards,
> Vlad


More information about the Plasma-devel mailing list