Re: Pushing to LibO-5-2

2016-06-23 Thread Stephan Bergmann

On 06/21/2016 10:07 PM, Laurent BP wrote:

sberg wrote

All three of the mentioned https://gerrit.libreoffice.org/26117;,
https://gerrit.libreoffice.org/26118;,
https://gerrit.libreoffice.org/26119; refer to
https://bugs.documentfoundation.org/show_bug.cgi?id=94004;


The history of the resolution of this bug is not complete. A first commit
fix it only for polynomial equation, because I wanted to have the smaller
commit (as I thought it was easier for review). This commit was merged to
master before 5-2 branch.
https://bugs.documentfoundation.org/show_bug.cgi?id=94004#c6
Then it takes some time before the 3 other commits for other equation types
were reviewed, and 5-2 was branched. I thought it would not have been a good
idea to have an incomplete feature (wrapping equations if they are too long,
not for all equation types) in LibO 5.2, and I proposed to backport them in
LibO 5.2 beta.

Was I wrong?


Of course, my remarks were of a generic nature, and there may well be 
good reason to do otherwise for specific cases.  I personally have no 
idea about this specific case, though.


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


Re: Pushing to LibO-5-2

2016-06-21 Thread Laurent BP
sberg wrote
> All three of the mentioned https://gerrit.libreoffice.org/26117;, 
> https://gerrit.libreoffice.org/26118;, 
> https://gerrit.libreoffice.org/26119; refer to 
> https://bugs.documentfoundation.org/show_bug.cgi?id=94004;

The history of the resolution of this bug is not complete. A first commit
fix it only for polynomial equation, because I wanted to have the smaller
commit (as I thought it was easier for review). This commit was merged to
master before 5-2 branch. 
https://bugs.documentfoundation.org/show_bug.cgi?id=94004#c6
Then it takes some time before the 3 other commits for other equation types
were reviewed, and 5-2 was branched. I thought it would not have been a good
idea to have an incomplete feature (wrapping equations if they are too long,
not for all equation types) in LibO 5.2, and I proposed to backport them in
LibO 5.2 beta.

Was I wrong?

Best regards,

Laurent BP



-
LibreOffice 5.1.4.1
--
View this message in context: 
http://nabble.documentfoundation.org/Pushing-to-LibO-5-2-tp4186528p4186832.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: Pushing to LibO-5-2

2016-06-21 Thread Stephan Bergmann

On 06/21/2016 01:46 PM, jan iversen wrote:

And as Stephan pointed out: Only bugfixes go in.

And since this is a bugfix it should not be a problem ?


All three of the mentioned , 
, 
 refer to 
 "Trend line 
equation should fit in chart" with "Version (earliest affected)" set to 
"4.2.0.4 release".  So from what I wrote I wouldn't necessarily consider 
that a fix of a recently introduced regression, and personally wouldn't 
bother backporting it (and in doing so risking introducing new regressions).

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


Re: Pushing to LibO-5-2

2016-06-21 Thread Christian Lohmaier
On Tue, Jun 21, 2016 at 1:46 PM, jan iversen
 wrote:
> On 21 Jun 2016, at 13:03, Christian Lohmaier 
> wrote:
>
> Only in beta phase does a x-y branch not require review. after that it
> needs one review.
>
> Maybe the text should be corrected in our wiki:
>
> No review required until the last beta
>

Just read that one along with the next bullet-point...

> which I read as no extra review is needed for a X-Y branch.

"until last beta"

> And as Stephan pointed out: Only bugfixes go in.
>
> And since this is a bugfix it should not be a problem ?

No idea what "this" is, as that wasn't part of the mail thread...

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


Re: Pushing to LibO-5-2

2016-06-21 Thread jan iversen


> On 21 Jun 2016, at 13:03, Christian Lohmaier  wrote:
> 
> On Sun, Jun 19, 2016 at 9:07 AM, jan iversen
>  wrote:
>> 
>> As a new committer (thanks again for your confidence), I don't know yet all
>> the rules and I prefer to ask before breaking something.
>> 
>> Asking is clearly better than breaking :-)
>> 
>> As it is for 5-2 branch, do they require review from someone else than me,
>> before they can be pushed? (commits were already reviewed for master by jan)
>> 
>> Our review rules are described here (and how to add a patch to a branch):
>> https://wiki.documentfoundation.org/Development/Branches
>> Your patches are fixes to a X-Y branch, so no further review required.
> 
> Only in beta phase does a x-y branch not require review. after that it
> needs one review.

Maybe the text should be corrected in our wiki:
No review required until the last beta

which I read as no extra review is needed for a X-Y branch.

> And as Stephan pointed out: Only bugfixes go in.
And since this is a bugfix it should not be a problem ?

rgds
jan I.

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


Re: Pushing to LibO-5-2

2016-06-21 Thread Christian Lohmaier
On Sun, Jun 19, 2016 at 9:07 AM, jan iversen
 wrote:
>
> As a new committer (thanks again for your confidence), I don't know yet all
> the rules and I prefer to ask before breaking something.
>
> Asking is clearly better than breaking :-)
>
> As it is for 5-2 branch, do they require review from someone else than me,
> before they can be pushed? (commits were already reviewed for master by jan)
>
> Our review rules are described here (and how to add a patch to a branch):
> https://wiki.documentfoundation.org/Development/Branches
> Your patches are fixes to a X-Y branch, so no further review required.

Only in beta phase does a x-y branch not require review. after that it
needs one review.

And as Stephan pointed out: Only bugfixes go in.

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


Re: Pushing to LibO-5-2

2016-06-20 Thread Stephan Bergmann

On 06/19/2016 09:07 AM, jan iversen wrote:

https://wiki.documentfoundation.org/Development/Branches


...states, for "libreoffice-X-Y": "Only fixes go in, no features".  I'd 
encourage everyone to read that as "only fixes to recently introduced 
featues or recently introduced regressions, or security relevant fixes." 
 Fixes for minor issues that had been broken since ~forever can likely 
wait for the next LO X+1.

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


Re: Pushing to LibO-5-2

2016-06-19 Thread jan iversen

Hi

> As a new committer (thanks again for your confidence), I don't know yet all
> the rules and I prefer to ask before breaking something.
Asking is clearly better than breaking :-)

> As it is for 5-2 branch, do they require review from someone else than me,
> before they can be pushed? (commits were already reviewed for master by jan)
Our review rules are described here (and how to add a patch to a branch):
https://wiki.documentfoundation.org/Development/Branches
Your patches are fixes to a X-Y branch, so no further review required.

Letting the patch linger a couple of days in gerrit is not a demand, but gives 
others a chance to comment, therefore highly recommended.

Your patches has been lingering, so go ahead and do your first merge,

> Thanks for your help.
Thanks for your work.

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


Pushing to LibO-5-2

2016-06-18 Thread Laurent BP
Hello,

As a new committer (thanks again for your confidence), I don't know yet all
the rules and I prefer to ask before breaking something.
I would like to push to 5-2 branch some commits (which are already pushed in
master)
https://gerrit.libreoffice.org/26117
https://gerrit.libreoffice.org/26118
https://gerrit.libreoffice.org/26119

As it is for 5-2 branch, do they require review from someone else than me,
before they can be pushed? (commits were already reviewed for master by jan)

Thanks for your help.

Best regards

Laurent BP



-
LibreOffice 5.1.0.3
--
View this message in context: 
http://nabble.documentfoundation.org/Pushing-to-LibO-5-2-tp4186528.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice