You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@jackrabbit.apache.org by Dominique Pfister <dp...@adobe.com> on 2014/03/12 11:32:48 UTC

svn:eol-style missing (CR+LF in source files)

Hi,

I'm currently reviewing a patch submitted in JCR-3729, and when I try to
apply to trunk, it fails for various files, although the version it is
based on is the same as mine.

I realized that the files rejected all have CR+LF line terminators in my
checkout, although I'm working on Mac OS X, and svn:eol-style is missing
for those files. Apparently, it is this non-native line termination policy
that confuses patch.

Is this an oversight or did we change our convention to not specify
svn:eol-style anymore?

Thanks
Dominique

BTW: "grep -l '^M' $(find . -name \*.java)" reports 49 files in
jackrabbit-data that have CR+LF line terminators

Re: svn:eol-style missing (CR+LF in source files)

Posted by Jukka Zitting <ju...@gmail.com>.
Hi,

On Wed, Mar 12, 2014 at 6:44 AM, Julian Reschke <ju...@gmx.de> wrote:
> All files IMHO need svn:eol-style native, and AFAIK this is NOT added
> automatically.

Right. Unfortunately subversion doesn't come with correct eol-style
settings out of the box, so one needs to explicitly configure the
correct settings (see http://www.apache.org/dev/svn-eol-style.txt)
whenever switching to a new computer.

BR,

Jukka Zitting

Re: svn:eol-style missing (CR+LF in source files)

Posted by Julian Reschke <ju...@gmx.de>.
On 2014-03-12 11:32, Dominique Pfister wrote:
> Hi,
>
> I'm currently reviewing a patch submitted in JCR-3729, and when I try to
> apply to trunk, it fails for various files, although the version it is
> based on is the same as mine.
>
> I realized that the files rejected all have CR+LF line terminators in my
> checkout, although I'm working on Mac OS X, and svn:eol-style is missing
> for those files. Apparently, it is this non-native line termination
> policy that confuses patch.
>
> Is this an oversight or did we change our convention to not specify
> svn:eol-style anymore?
>
> Thanks
> Dominique
>
> BTW: "grep -l '^M' $(find . -name \*.java)" reports 49 files in
> jackrabbit-data that have CR+LF line terminators

All files IMHO need svn:eol-style native, and AFAIK this is NOT added 
automatically.

(I occasionally run a script to fix these)

Best regards, Julian