unostyle.cxx: Repeatedly driving over changes of others ...

classic Classic list List threaded Threaded
8 messages Options
Bjoern Michaelsen Bjoern Michaelsen
Reply | Threaded
Open this post in threaded view
|

unostyle.cxx: Repeatedly driving over changes of others ...

Hi Chris,

with commits:

 http://cgit.freedesktop.org/libreoffice/core/commit/sw/source/core/unocore/unostyle.cxx?id=2b297116cb6bb1061c43e5714e2609c8ee9f57d2

which was reverted by Norbert for breaking the build and then again:

 http://cgit.freedesktop.org/libreoffice/core/commit/sw/source/core/unocore/unostyle.cxx?id=28c96fc2553a5c3dee108f1e2060d7bc081a7e7e

which is not trivially revertable anymore right now, you mangled and undid the
changes done to sw/source/core/unocore/unostyle.cxx with a steamroller --
_twice_.

Please stop whatever you are doing right now and an ensure to restore
unostyle.cxx to be properly based on:

 http://cgit.freedesktop.org/libreoffice/core/commit/sw/source/core/unocore/unostyle.cxx?id=394895de8c47e7ab3b560d1ecb3242901a9ff92b

ASAP. I assume this was a innocent (if repeated) mistake and not an attempt at
wikipedia-editwar brute forcing, but if you have 'accidents' like this please
consider to SLOW IT DOWN.

Please make sure to clean up this mess in the next 48 hours and that you dont
undo the work of others in the future.

Best,

Bjoern
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Chris Sherlock Chris Sherlock
Reply | Threaded
Open this post in threaded view
|

Re: unostyle.cxx: Repeatedly driving over changes of others ...

I can assure you, it was entirely innocent! I would *never* do this on purpose. I’ll fix this ASAP.

Terribly sorry, I didn’t realise I had done this.

I will fix this immediately.

Chris

> On 20 Jan 2016, at 7:00 AM, Bjoern Michaelsen <[hidden email]> wrote:
>
> Hi Chris,
>
> with commits:
>
> http://cgit.freedesktop.org/libreoffice/core/commit/sw/source/core/unocore/unostyle.cxx?id=2b297116cb6bb1061c43e5714e2609c8ee9f57d2
>
> which was reverted by Norbert for breaking the build and then again:
>
> http://cgit.freedesktop.org/libreoffice/core/commit/sw/source/core/unocore/unostyle.cxx?id=28c96fc2553a5c3dee108f1e2060d7bc081a7e7e
>
> which is not trivially revertable anymore right now, you mangled and undid the
> changes done to sw/source/core/unocore/unostyle.cxx with a steamroller --
> _twice_.
>
> Please stop whatever you are doing right now and an ensure to restore
> unostyle.cxx to be properly based on:
>
> http://cgit.freedesktop.org/libreoffice/core/commit/sw/source/core/unocore/unostyle.cxx?id=394895de8c47e7ab3b560d1ecb3242901a9ff92b
>
> ASAP. I assume this was a innocent (if repeated) mistake and not an attempt at
> wikipedia-editwar brute forcing, but if you have 'accidents' like this please
> consider to SLOW IT DOWN.
>
> Please make sure to clean up this mess in the next 48 hours and that you dont
> undo the work of others in the future.
>
> Best,
>
> Bjoern

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Chris Sherlock Chris Sherlock
Reply | Threaded
Open this post in threaded view
|

Re: unostyle.cxx: Repeatedly driving over changes of others ...

In reply to this post by Bjoern Michaelsen
I am just compiling now.

Chris

> On 20 Jan 2016, at 7:00 AM, Bjoern Michaelsen <[hidden email]> wrote:
>
> Hi Chris,
>
> with commits:
>
> http://cgit.freedesktop.org/libreoffice/core/commit/sw/source/core/unocore/unostyle.cxx?id=2b297116cb6bb1061c43e5714e2609c8ee9f57d2
>
> which was reverted by Norbert for breaking the build and then again:
>
> http://cgit.freedesktop.org/libreoffice/core/commit/sw/source/core/unocore/unostyle.cxx?id=28c96fc2553a5c3dee108f1e2060d7bc081a7e7e
>
> which is not trivially revertable anymore right now, you mangled and undid the
> changes done to sw/source/core/unocore/unostyle.cxx with a steamroller --
> _twice_.
>
> Please stop whatever you are doing right now and an ensure to restore
> unostyle.cxx to be properly based on:
>
> http://cgit.freedesktop.org/libreoffice/core/commit/sw/source/core/unocore/unostyle.cxx?id=394895de8c47e7ab3b560d1ecb3242901a9ff92b
>
> ASAP. I assume this was a innocent (if repeated) mistake and not an attempt at
> wikipedia-editwar brute forcing, but if you have 'accidents' like this please
> consider to SLOW IT DOWN.
>
> Please make sure to clean up this mess in the next 48 hours and that you dont
> undo the work of others in the future.
>
> Best,
>
> Bjoern

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Bjoern Michaelsen Bjoern Michaelsen
Reply | Threaded
Open this post in threaded view
|

Re: unostyle.cxx: Repeatedly driving over changes of others ...

In reply to this post by Chris Sherlock
Hi Chris,

On Wed, Jan 20, 2016 at 07:02:37AM +1100, Chris Sherlock wrote:
> I will fix this immediately.

Thanks, I was first confused by the source I saw lcov.libreoffice.org operating
on and then got a bit indignified when I figured out what happened looking at
the commit log. If this is fixed soonish, lets forget about this, no harm done.

Best,

Bjoern
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Chris Sherlock Chris Sherlock
Reply | Threaded
Open this post in threaded view
|

Re: unostyle.cxx: Repeatedly driving over changes of others ...

Hey, I totally understand the feeling - I made a number of mistakes and compounded things greatly.

It honestly shouldn’t take long to fix this - I just need to get the original file and then change all the GetName’s to GetFamilyName on that one file :-) The only limiting factor is how fast my computer will build sw!

For the original issue, I’m going to start building on my own OS X machine and not rely on gerrit so much, and I’ll resurrect my Windows laptop (hopefully not on its last legs) and install lode. That should help with my build workflow, and take some pressure off the buildbots, and should prevent me from making mistakes like that in future.

Chris


> On 20 Jan 2016, at 7:32 AM, Bjoern Michaelsen <[hidden email]> wrote:
>
> Hi Chris,
>
> On Wed, Jan 20, 2016 at 07:02:37AM +1100, Chris Sherlock wrote:
>> I will fix this immediately.
>
> Thanks, I was first confused by the source I saw lcov.libreoffice.org operating
> on and then got a bit indignified when I figured out what happened looking at
> the commit log. If this is fixed soonish, lets forget about this, no harm done.
>
> Best,
>
> Bjoern

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Chris Sherlock Chris Sherlock
Reply | Threaded
Open this post in threaded view
|

Re: unostyle.cxx: Repeatedly driving over changes of others ...

OK, this is taking a little longer than I was expecting. I know exactly how to fix this, I’m afraid I was so embarrassed by the mistake I made that I forgot I was in the middle of another change I was making when I read this email that I fixed up the issue and managed to entangle that change in my fix.

Don’t worry, it’s not something I’ve committed to master, but I’m redoing the change now and doing another build on my local system. I’ll send this to gerrit and ensure it builds cleanly - I’ll update the list with the gerrit URL when I do so.

Once again, I deeply apologise for the error I made repeatedly. I’ve stopped all work on anything till I get this fixed, which I want to do in as clean a manner as possible.

Chris

> On 20 Jan 2016, at 7:37 AM, Chris Sherlock <[hidden email]> wrote:
>
> Hey, I totally understand the feeling - I made a number of mistakes and compounded things greatly.
>
> It honestly shouldn’t take long to fix this - I just need to get the original file and then change all the GetName’s to GetFamilyName on that one file :-) The only limiting factor is how fast my computer will build sw!
>
> For the original issue, I’m going to start building on my own OS X machine and not rely on gerrit so much, and I’ll resurrect my Windows laptop (hopefully not on its last legs) and install lode. That should help with my build workflow, and take some pressure off the buildbots, and should prevent me from making mistakes like that in future.
>
> Chris
>
>
>> On 20 Jan 2016, at 7:32 AM, Bjoern Michaelsen <[hidden email]> wrote:
>>
>> Hi Chris,
>>
>> On Wed, Jan 20, 2016 at 07:02:37AM +1100, Chris Sherlock wrote:
>>> I will fix this immediately.
>>
>> Thanks, I was first confused by the source I saw lcov.libreoffice.org operating
>> on and then got a bit indignified when I figured out what happened looking at
>> the commit log. If this is fixed soonish, lets forget about this, no harm done.
>>
>> Best,
>>
>> Bjoern
>

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Chris Sherlock Chris Sherlock
Reply | Threaded
Open this post in threaded view
|

Re: unostyle.cxx: Repeatedly driving over changes of others ...

In reply to this post by Chris Sherlock
I have submitted a fix to gerrit, waiting for Jenkins to verify this on all platforms.

https://gerrit.libreoffice.org/#/c/21618/

Chris

> On 20 Jan 2016, at 7:37 AM, Chris Sherlock <[hidden email]> wrote:
>
> Hey, I totally understand the feeling - I made a number of mistakes and compounded things greatly.
>
> It honestly shouldn’t take long to fix this - I just need to get the original file and then change all the GetName’s to GetFamilyName on that one file :-) The only limiting factor is how fast my computer will build sw!
>
> For the original issue, I’m going to start building on my own OS X machine and not rely on gerrit so much, and I’ll resurrect my Windows laptop (hopefully not on its last legs) and install lode. That should help with my build workflow, and take some pressure off the buildbots, and should prevent me from making mistakes like that in future.
>
> Chris
>
>
>> On 20 Jan 2016, at 7:32 AM, Bjoern Michaelsen <[hidden email]> wrote:
>>
>> Hi Chris,
>>
>> On Wed, Jan 20, 2016 at 07:02:37AM +1100, Chris Sherlock wrote:
>>> I will fix this immediately.
>>
>> Thanks, I was first confused by the source I saw lcov.libreoffice.org operating
>> on and then got a bit indignified when I figured out what happened looking at
>> the commit log. If this is fixed soonish, lets forget about this, no harm done.
>>
>> Best,
>>
>> Bjoern
>

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Chris Sherlock Chris Sherlock
Reply | Threaded
Open this post in threaded view
|

Re: unostyle.cxx: Repeatedly driving over changes of others ...

The buildbots have finally finished verifying the patch, it has been successful and I’ve pushed it to master.

Bjoern, I hope that this is correct. I’ve carefully checked that the function is exactly the same as the one you committed, I’ve only made one change which was to modify the function that is called from GetName to GetFamilyName.

If you see any issues, please let me know straight away - I don’t think there are any now though.

Thanks for your patience.

Chris

> On 20 Jan 2016, at 11:47 AM, Chris Sherlock <[hidden email]> wrote:
>
> I have submitted a fix to gerrit, waiting for Jenkins to verify this on all platforms.
>
> https://gerrit.libreoffice.org/#/c/21618/
>
> Chris
>
>> On 20 Jan 2016, at 7:37 AM, Chris Sherlock <[hidden email]> wrote:
>>
>> Hey, I totally understand the feeling - I made a number of mistakes and compounded things greatly.
>>
>> It honestly shouldn’t take long to fix this - I just need to get the original file and then change all the GetName’s to GetFamilyName on that one file :-) The only limiting factor is how fast my computer will build sw!
>>
>> For the original issue, I’m going to start building on my own OS X machine and not rely on gerrit so much, and I’ll resurrect my Windows laptop (hopefully not on its last legs) and install lode. That should help with my build workflow, and take some pressure off the buildbots, and should prevent me from making mistakes like that in future.
>>
>> Chris
>>
>>
>>> On 20 Jan 2016, at 7:32 AM, Bjoern Michaelsen <[hidden email]> wrote:
>>>
>>> Hi Chris,
>>>
>>> On Wed, Jan 20, 2016 at 07:02:37AM +1100, Chris Sherlock wrote:
>>>> I will fix this immediately.
>>>
>>> Thanks, I was first confused by the source I saw lcov.libreoffice.org operating
>>> on and then got a bit indignified when I figured out what happened looking at
>>> the commit log. If this is fixed soonish, lets forget about this, no harm done.
>>>
>>> Best,
>>>
>>> Bjoern
>>
>

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice