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

Re: inconsistent newlines: "native" seems not to work

From: Peter Mounce <pmounce_at_narrowstep.com>
Date: 2006-12-05 11:24:41 CET

Hello Gavin,

> Quoth Mattias Thorslund:
>
>> One of my project developers is using Tortoise SVN, and receives the
>> "inconsistent newlines" error. His editor is XMLShell (really MSXML
>> 4.0), and all files he edits are XML files.
>>
>> The svn:eol-style property is "native" on the file on the Subversion
>> server. We've tried renaming the file that causes the error, and
>> doing a SVN Update (so that we'll get a fresh download of the file
>> from the server), but after editing, we still get the "inconsistent
>> newlines" ("Inconsistent line ending style") error.
>>
>> Is there something else that I am missing, or is the Windows CRLF
>> line-ending style not applies when svn:eol-style is "native"?
>>
> It sounds like the editor is changing the EOL style, perhaps only on
> some lines (some ill-mannered editors do this).
>
> Try throwing the file at a hex viewer/editor both before and after
> editing, and make sure that all your LFs have CRs. Most likely you'll
> find that on some lines you have LFs alone without CRs, indicating
> that the editor probably opened the file in binary mode rather than
> text mode. In this case, you should probably convert the file to
> LF-only, assuming that everybody using the file is using the same
> editor. Alternatively, get a better editor :)

Notepad2 has a nice feature that lets you normalise line-endings for a whole
file at once. File | Line Endings | [pick one]. It will also show you which
ones are currently there.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Dec 5 11:25:17 2006

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