[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: line-endings of conflict-markers.

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: 2005-11-28 21:49:57 CET

On 11/28/05, Kees <bluemoon@xs4all.nl> wrote:
> > That seems very strange. If you set the line ending to native, you
> > can check out on either side without trouble.
> we've had experience with cvs which will always convert line-endings.
> We do not want subversion to mess with the line-endings.
> > Even if you want to check out on one system and just copy the
> > directory, Unix line endings are the better answer -- with the
> > exception of Windows-specific files like MSVC++ project files.
> > I agree: Unix line endings would be a better choice, and it's what
> > we've standardized on in our company. But perhaps that's only because
> > a good Windows editor can deal with files with Unix line endings,
> > while Unix/Linux commandline utilities in my experience cannot.
> We have standardized on windows line-endings because we found out that
> windows editors are very picky. So we took the easy way out for windows
> users and made it a bit more difficult for the linux users (Which fits
> nicely). But now we have an issue with the line-endings and I have not a
> good feeling that it will be solved because a bug report was created in
> 2003.

If you set svn:eol-style to CRLF, you ask Subversion to output files
in that EOL style. From what you describe above, I'm not sure you did

I can see in the code there is an error wrt the actual EOL style sent
out though; as lundblad, I can have a look at this, since I'm
committing code next week which makes it WAY easier to solve the bug.


Received on Mon Nov 28 22:48:21 2005

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.