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

Re: Conflict marker places Unix line endings in DOS file under Linux

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-11-05 19:41:36 CET

On Nov 5, 2004, at 9:29 AM, kfogel@collab.net wrote:

> David Mohr <damailings@mcbf.net> writes:
>> I was working on a file with DOS line endings under Linux and then
>> there
>> was a conflict in a commit, so subversion placed the conflict markers
>> into the file. However, I assume since I was using Linux, it placed
>> the
>> conflict markers with Unix line endings, which made the line endings
>> in
>> the file inconsistent.
>> This bug is of course not hard to work around, as I assume will delete
>> the conflict markers before the next commit, so the line endings will
>> be
>> sane again. But still, it's a small bug. Should I submit this
>> somewhere?
>> I could not find a way to submit issues on the web page.
>
> If you have an account at subversion.tigris.org, with 'observer' role,
> then you can create issues, following the guidelines at
>
> http://subversion.tigris.org/project_issues.html
>
> If you could write a small script to demonstrate this bug (a
> reproduction recipe) that would be very helpful. Just attach it to
> the new issue.
>

I really wonder if it's a bug, though.

At the moment, I think you're right: svn is using APR_EOL for
conflict-marker line endings, which is automatically defined by APR to
be the native line ending for whatever OS you happen to be using at the
moment.

The only way svn could be "smarter" here is to scan the entire file,
notice what the line-endings are, and then decide to use those same
line-endings for conflict markers. But that's an awfully expensive
operation. (And what if the file has inconsistent line endings?)

It makes me ask: why aren't using the svn:eol-style property? I'm
willing to bet that if "svn:eol-style" were set to "CRLF", then the
conflict markers would use CRLF also.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Nov 5 19:42:33 2004

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