Fix for Bug 98940
mstahl at redhat.com
Wed May 4 11:58:57 UTC 2016
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 at 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.
More information about the LibreOffice