[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-12-03 10:30:27 CET

> But how do you expect Subversion to know (on linux) that it should use
> CRLF line endings, if you don't tell it to?
OK, you must know that english is not my native language, so maybe I
didn't explain the problem correctly. Here is my problem:

I do not set the svn:eol-style of any file because I want subversion to
store it in the repository just as it is. In fact subversion does that
correctly, it doesn't change the line-endings. which is very good !
(This was one of the big problems we had with cvs)

But when I 'svn update' a file and there is a merge-conflict the
line-endings of the conflict-markers are in the native style (note: ONLY
the conflict-markers!). My problem is that I would like subversion to
set the line-endings of the conflict-markers in the same style as the
rest of the file.
If subversion knows the svn:eol-style the style is known but when I do
__not__ set the svn:eol-style subversion doesn't know. But in that case
subversion could make a good guess by looking at the rest of the file.
(That's what I meant by guessing!)

> Subversion doesn't guess...
> Sorry, but we can't have a version control system trying to second
> guess what users mean to do. The Subversion developers work the same
> way: writing a program which does well defined things on well defined
> commands.
I didn't mean to offend!

> bye,


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Dec 3 10:35:28 2005

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