|
|
All trailing whitespaces (spaces and tabs) removed from help repository.
In that place those really multiplies and quickly... Patches found in: http://ronkko.wippiespace.com/LibO/ MPL 1.1 / GPLv3+ / LGPLv3+ _______________________________________________ LibreOffice mailing list [hidden email] http://lists.freedesktop.org/mailman/listinfo/libreoffice |
|
Jan Holesovsky |
|
|
Hi Niko,
On 2010-11-13 at 10:24 +0200, Niko Rönkkö wrote: > All trailing whitespaces (spaces and tabs) removed from help repository. > In that place those really multiplies and quickly... > > Patches found in: > http://ronkko.wippiespace.com/LibO/ I am sorry, but as discussed previously [1], we would prefer not to fix the trailing whitespace yet, until git with better merge strategies (to handle whitespace changes flawlessly during merges) is released. Based on this, I cannot apply your patches, I am sorry :-( Do you think you would be interested in another Easy Hack? Eg. lots of people are involved in the RTL_CONSTASCII_USTRINGPARAM usage [2] these days... [1] http://lists.freedesktop.org/archives/libreoffice/2010-November/002309.html and the following messages in that thread [2] http://wiki.documentfoundation.org/Development/Easy_Hacks#Use_RTL_CONSTASCII_USTRINGPARAM_macro Regards, Kendy _______________________________________________ LibreOffice mailing list [hidden email] http://lists.freedesktop.org/mailman/listinfo/libreoffice |
|
Miklos Vajna |
|
|
On Mon, Nov 15, 2010 at 02:08:52PM +0100, Jan Holesovsky <[hidden email]> wrote:
> I am sorry, but as discussed previously [1], we would prefer not to fix > the trailing whitespace yet, until git with better merge strategies (to > handle whitespace changes flawlessly during merges) is released. Have you tried the ignore-all-space option of git merge-recursive, which was added recently in version 1.7.2? (It was released this summer.) _______________________________________________ LibreOffice mailing list [hidden email] http://lists.freedesktop.org/mailman/listinfo/libreoffice |
|
Jan Holesovsky |
|
|
Hi Miklos,
On 2010-11-15 at 21:29 +0100, Miklos Vajna wrote: > > I am sorry, but as discussed previously [1], we would prefer not to fix > > the trailing whitespace yet, until git with better merge strategies (to > > handle whitespace changes flawlessly during merges) is released. > > Have you tried the ignore-all-space option of git merge-recursive, which > was added recently in version 1.7.2? (It was released this summer.) That's exactly the one I wanted to try/use, and still do not have it in my 1.7.3.1 (from http://download.opensuse.org/repositories/devel:/tools:/scm/SLE_11/) :-( Even the man page does not mention it here. Do you know if there there si a build-time option to enable it, or something? Thank you, Kendy _______________________________________________ LibreOffice mailing list [hidden email] http://lists.freedesktop.org/mailman/listinfo/libreoffice |
|
Miklos Vajna |
|
|
On Tue, Nov 16, 2010 at 08:41:28AM +0100, Jan Holesovsky <[hidden email]> wrote:
> That's exactly the one I wanted to try/use, and still do not have it in > my 1.7.3.1 (from > http://download.opensuse.org/repositories/devel:/tools:/scm/SLE_11/) :-( > Even the man page does not mention it here. > > Do you know if there there si a build-time option to enable it, or > something? Oh, git describe confused me. So it was added to the tree a while ago, but not merged to master - so you are right, 1.7.4 will have it, it's not yet released. Miklos _______________________________________________ LibreOffice mailing list [hidden email] http://lists.freedesktop.org/mailman/listinfo/libreoffice |
| Powered by Nabble | Edit this page |