[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: <kfogel_at_collab.net>
Date: 2004-11-05 16:29:59 CET

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


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.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Nov 5 18:25:01 2004

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.