On Sat, Nov 14, 2020 at 4:51 AM Branko Čibej <brane_at_apache.org> wrote:
>
> On 13.11.2020 17:37, Nathan Hartman wrote:
> > 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')?
Looks like a bug to me. I'll try to track it down... It has something
to do with eol-style processing. I also get "E200042: Additional
errors:" but there are no additional errors listed. Same result
happens regardless of the order of merging the two revisions, but
removing the svn-eol-style property makes 'svn diff' work normally.
$ svn merge -c 1881534 https://svn.apache.org/repos/asf/subversion/trunk
--- Merging r1881534 into '.':
U build/ac-macros/macosx.m4
--- Recording mergeinfo for merge of r1881534 into '.':
U .
$ svn merge -c 1883388 https://svn.apache.org/repos/asf/subversion/trunk
--- Merging r1883388 into '.':
U build/ac-macros/macosx.m4
--- Recording mergeinfo for merge of r1883388 into '.':
G .
$ svn st
M .
MM build/ac-macros/macosx.m4
$ svn diff
svn: E135000: File
'/mount/ramdrive/svn-trunk/build/ac-macros/macosx.m4' has inconsistent
newlines
svn: E135000: Inconsistent line ending style
svn: E200042: Additional errors:
$ svn propdel svn:eol-style build/ac-macros/macosx.m4
property 'svn:eol-style' deleted from 'build/ac-macros/macosx.m4'.
$ svn diff
Index: build/ac-macros/macosx.m4
===================================================================
<snip>
Nathan
Received on 2020-11-15 19:16:46 CET