Doing massive source changes
Matteo Casalin
matteo.casalin at gmx.com
Fri Jan 4 07:03:21 PST 2013
Hi,
On 01/04/2013 03:12 PM, Lubos Lunak wrote:
>
> Hello,
>
> I have a patch that is 32M big and I rather wonder when to commit it.
>
> The patch specifically is string rtl:: prefix removal. These changes
> regularly show up in gerrit patches for review, but I think we have somewhat
> better EasyHacks for new developers than rather mindless search&replace, and
> it's somewhat annoying to review such diffs as well. So instead I've done the
> change over the entire codebase where possible.
Also, I've seen that some patches on Gerrit that still introduce that
rtl:: (or ::rtl::) prefix - I can't really say if in code that actually
requires them or not, but I seem to recall mixed notation in some of them.
Is there any way to filter those out in order to avoid future actions on
this?
> The problem is, the change is so extensive that it touches pretty much
> everything ("9117 files changed, 92833 insertions(+), 95662 deletions(-)").
> Given that we branched 4-0 a short time back, this will probably mean
> backporting will often need adjusting. So the options I see:
>
> - wait until before 4-1 branch-off (or do not do such a big change at all) -
> this would mean there still would be these changes done in small bits by
> other people (including the gerrit review overhead)
>
> - push now, only to master - this would mean more likely conflicts when
> backporting changes
>
> - push now, including to 4-0 - I can successfully do a full build, including
> make check, and I've avoided public API modules (sal, salhelper, cppu,
> cppuhelper, odk - any others?), so this hopefully should be safe, but most of
> the changes have been done using sed, so there may be something that I've
> missed
>
> Does somebody have a preference? I consider the last one to be the best
> option.
>
More information about the LibreOffice
mailing list