Cherry-picking policy

Aleix Pol aleixpol at kde.org
Wed Nov 16 14:03:08 GMT 2022


+1, thanks for bringing this up, this is also something I'd pondered at times.

Adding  sysadmin on CC as automating this has been brought up and
AFAIR this was something they'd been working on before.

Aleix

On Wed, Nov 16, 2022 at 11:12 AM Vlad Zahorodnii
<vlad.zahorodnii at kde.org> 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