Cherry-picking policy

[Ben Cooksley]

On Thu, Nov 17, 2022 at 3:03 AM Aleix Pol <aleixpol at kde.org> wrote:

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

Hey Aleix,

Not sure how much of this is on our radar at the moment, but I do know that
we were playing with a bot to do tagging of MRs at one point in time.

In terms of how this bot operates, how are people thinking it should work?

Cheers,
Ben


> 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
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20221119/1dbeaa68/attachment.htm>