Re: Cherry pick for 7.1.1

2021-02-19 Thread Jan-Marek Glogowski
Am 19.02.21 um 17:25 schrieb Dante Doménech: I won't next time. I've set them as WIP so they can be ignored until then. El vie, 19 feb 2021 a las 13:52, Eike Rathke (>) escribió: On Thursday, 2021-02-18 18:02:25 +0100, Dante Doménech wrote: > I did cherry pic

Re: Cherry pick for 7.1.1

2021-02-19 Thread Dante Doménech
I won't next time. I've set them as WIP so they can be ignored until then. El vie, 19 feb 2021 a las 13:52, Eike Rathke () escribió: > Hi Dante, > > On Thursday, 2021-02-18 18:02:25 +0100, Dante Doménech wrote: > > > I did cherry pick a patch for 7.1.1 > > As a side note, please don't create cher

Re: Cherry pick for 7.1.1

2021-02-19 Thread Eike Rathke
Hi Dante, On Thursday, 2021-02-18 18:02:25 +0100, Dante Doménech wrote: > I did cherry pick a patch for 7.1.1 As a side note, please don't create cherry-picks to release branches before the original change wasn't even merged to master, here https://gerrit.libreoffice.org/c/core/+/55 Thanks

Re: Cherry pick for 7.1.1

2021-02-18 Thread Ilmari Lauhakangas
cfgitem.hxx seems to have an unresolved merge conflict, see the first and last lines Ilmari On 18.2.2021 19.02, Dante Doménech wrote: Hello. It's the first time I'm doing this, so I have some doubts. I did cherry pick a patch for 7.1.1 but I'm having a strange behaviour. This file starmath/inc

Cherry pick for 7.1.1

2021-02-18 Thread Dante Doménech
Hello. It's the first time I'm doing this, so I have some doubts. I did cherry pick a patch for 7.1.1 but I'm having a strange behaviour. This file starmath/inc/cfgitem.hxx appears as a new creation, but only 2 lines of code should have been added. Does anyone know what could be happening? (patch