Re: Cherry pick for 7.1.1

[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 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


FYI: this is not about ignorance in Gerrit. For release branches you 
need reviews, which get added to the commit message automatically on 
submit from Gerrit, if someone sets a +1 / +2. And Gerrit also adds the 
"cherry picked from" line as a reference to the origin, like:


Change-Id: Ia639ee3e5fc0e47f7017896b34730bbda7f06a16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110945
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 41cffc379259fec626a282ca243a9750d96d1c63)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110915
Reviewed-by: Michael Weghorn 
(cherry picked from commit 61bf6b4d90aa1d37009b397e44fe39c9c5b06afd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110920
Reviewed-by: Michael Stahl 

So the cherry-pick gets more "history" and "trust".
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Cherry pick for 7.1.1

[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 cherry-picks to release branches
> before the original change wasn't even merged to master, here
> https://gerrit.libreoffice.org/c/core/+/55
>
> Thanks
>   Eike
>
> --
> GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563
> 2D3A
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Cherry pick for 7.1.1

[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
  Eike

-- 
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Cherry pick for 7.1.1

[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/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 over here: https://gerrit.libreoffice.org/c/core/+/49 
)


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice