[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-12-01 13:14:18 CET

On 11/30/05, Kees <bluemoon@xs4all.nl> wrote:
>
> >
> > 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
> line-endings.
>
> 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.

But how do you expect Subversion to know (on linux) that it should use
CRLF line endings, if you don't tell it to?

My point being: we can fix the problem when you tell Subversion to use
CRLF, but if you don't, we can't do anything but use the default...

> > 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)

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.

bye,

Erik.
Received on Thu Dec 1 13:17:41 2005

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