Mixed line endings.

[Ian Boston <ie...@tfd.co.uk>]

I am seeing files of different line ending types in the code base.  
This could be an artifact of using the Apache Git mirror to work from,  
but it could also be as a result of some misconfiguration somewhere.

I find bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/ 
sling/jcr/jackrabbit/accessmanager/post/DeleteAcesServlet.java is MSDOS
and
bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/ 
jackrabbit/usermanager/post/ChangeUserPasswordServlet.java is unix.

does anyone else see the same in SVN or is this an issue with the git  
mirror ?

Ian

Re: Mixed line endings.

[Ian Boston <ie...@tfd.co.uk>]

On 24 Apr 2009, at 20:36, Jukka Zitting wrote:

> I just added svn:eol-style settings to quite a few files in Sling. I'm
> not sure how well those settings are reflected in Git, but you may
> want to try rebasing your local changes to the latest changes from
> svn.

yes, looks like everything came through perfectly.
big patch :)
Thanks.
Ian

Re: Mixed line endings.

[Jukka Zitting <ju...@gmail.com>]

Hi,

On Thu, Apr 23, 2009 at 5:08 PM, Ian Boston <ie...@tfd.co.uk> wrote:
> Isn't that normally put in ~/.subversion/config
> or does its presence there add it to the file of first commit ?

Yes, all committers should have settings like
http://www.apache.org/dev/svn-eol-style.txt in their Subversion config
file. Then svn will automatically add the correct svn:eol-style
properties when new files are added.

> should I be doing anything in git locally ? My patches contain ^M which
> doesn't look great :)

I just added svn:eol-style settings to quite a few files in Sling. I'm
not sure how well those settings are reflected in Git, but you may
want to try rebasing your local changes to the latest changes from
svn.

BR,

Jukka Zitting

Re: Mixed line endings.

[Ian Boston <ie...@tfd.co.uk>]

Jukka,
Isn't that normally put in ~/.subversion/config
or does its presence there add it to the file of first commit ?

and

should I be doing anything in git locally ? My patches contain ^M  
which doesn't look great :)
Ian

On 23 Apr 2009, at 15:50, Jukka Zitting wrote:

> Hi,
>
> On Thu, Apr 23, 2009 at 4:43 PM, Ian Boston <ie...@tfd.co.uk> wrote:
>> does anyone else see the same in SVN [...]
>
> Yes, the files don't have svn:eol-style settings.
>
> BR,
>
> Jukka Zitting

Re: Mixed line endings.

[Jukka Zitting <ju...@gmail.com>]

Hi,

On Thu, Apr 23, 2009 at 4:43 PM, Ian Boston <ie...@tfd.co.uk> wrote:
> does anyone else see the same in SVN [...]

Yes, the files don't have svn:eol-style settings.

BR,

Jukka Zitting