On Sat, Nov 14, 2020 at 4:51 AM Branko Čibej <br...@apache.org> wrote:
>
> On 13.11.2020 17:37, Nathan Hartman wrote:
> > On Fri, Nov 13, 2020 at 9:20 AM Branko Čibej <br...@apache.org> wrote:
> >> On 07.09.2020 15:30, hartmannat...@apache.org wrote:
> >>> Author: hartmannathan
> >>> Date: Mon Sep 7 13:30:38 2020
> >>> New Revision: 1881534
> >>>
> >>> URL: http://svn.apache.org/viewvc?rev=1881534&view=rev
> >>> Log:
> >>> Avoid 'configure' error: cannot run test program while cross compiling
> >>
> >> Your changes added CRLF line endings to a script that didn't have them
> >> previously.
> >>
> >> a) set svn:eol-style (and update the backport proposal)
> > Done in r1883388. Added to the backport proposal but I'll let you un-veto
> > it :-)
>
>
> This fixes the issue on trunk, but when I merge the two revisions to
> 1.14.x ...
>
> $ svn diff
> svn: E135000: File '.../build/ac-macros/macosx.m4' has inconsistent newlines
> svn: E135000: Inconsistent line ending style
>
> $ svn ps svn:eol-style native build/ac-macros/macosx.m4
> svn: E200009: File '.../build/ac-macros/macosx.m4' has inconsistent newlines
> svn: E135000: Inconsistent line ending style
>
>
> Did we really mean this? that 'svn diff' errors out on inconsistent
> newlines? Really really? And that you can't make them consistent by
> setting the svn:eol-style property (which 'svn merge' already did')?
>
> -- Brane
To workaround the above problem ('svn diff' refuses to work due to
"inconsistent newlines" and/or addition of svn:eol-style property) I
created a backport branch wherein I manually fixed up the newlines.
This merges cleanly into 1.14.x and, after doing that, 'svn diff'
works. See below...
I re-nominated it in 1.14.x STATUS, "r1881534 (without CRLF problem)"
for your voting pleasure.
Cheers,
Nathan
