Re: Fix for Bug 98940

Hi Michael,
    thanks for the details.
I tried the "gerrit cherry-pick to libreoffice-5-1" method, and it seems [1] that the same one-line 
patch is enough. I agree that the fix is trivial, so I would prefer not testing it since my machine 
is quite slow - but if required I can give it a try.
Just to be sure: 5.1.4 will be branched from 5.1, not from 5.1.3, right?

Thanks again and kind regards
matteo

[1] https://gerrit.libreoffice.org/#/c/24654/

On Wed, 4 May 2016 13:58:57 +0200
Michael Stahl <mstahl@redhat.com> wrote:

> On 01.05.2016 18:37, Matteo Casalin wrote:
> > On 05/01/2016 12:23 PM, Christian Lohmaier wrote:
> > > On Fri, Apr 29, 2016 at 6:52 PM, Matteo Casalin
> > > <matteo.casalin@yahoo.com> wrote:
>
> > > > The aforementioned bug, however, affects the 5.1 branch and should be evaluated for 
> > > > backporting: what is the best approach to be followed for this?
> > >
> > > Cherry pick to gerrit and amend with any fixup necessary, so it ends
> > > up in 5.1 as one single commit.
> >
> > I'm not familiar with this flow, is this equivalent to:
> > * Switch my local copy to 5.1 branch
> > * Implement the same fix, plus any other modification needed to compile
>
> you can just use "git cherry-pick -x <master-commit-sha1>" to apply the
> patch to the release branch (and resolve merge conflicts if there are any).
>
> > * Submit to gerrit, specifying 5.1 branch
>
> that works - an alternative that may be easier is to go to your master
> change in gerrit web ui and click the "cherry-pick" button and specify
> "libreoffice-5-1" branch - that will only work if there are no merge
> conflicts, and if you want to test it locally it's not actually easier,
> but this fix looks rather trivial.