[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: Kees <bluemoon_at_xs4all.nl>
Date: 2005-11-30 19:29:23 CET

> 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
> that.
No, We did not set any EOL property.
I do not want subversion to change line-endings. Our programmers (as
commiters) MUST make sure that they feed subversion with the right

We have chosen NOT to set the EOL property to 'native' because we copy
versioned-sourcetree's from from linux to windows and from windows to
linux. (This will cause the damned ^M problem when commiting files on a
different operating system than the one that checked the file out)

I do not want to set the EOL property to 'CRLF' because than I will have
to tell (set svn:eol-style) subversion which files are text files (which
should convert line-endings) and which are not. As I said, Our
programmers have the responsibility to use the correct line-endings.

> 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.
I would be very pleased if this bug was resolved! It is now a major pain.
For me the problem would only be solved if it also works when EOL styIe
is NOT set.
(So you have to make a good guess from the file itself which
line-endings are being used)


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Nov 30 19:53:02 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.