"Inconsistent line ending style" nightmare

svn windows-7 tortoisesvn eol
Epoc picture Epoc · May 24, 2013 · Viewed 24.6k times · Source

I'm completely stuck with an SVN error when committing 2447 files at once. I'm using TortoiseSVN (latest version) on Windows 7 64bits.

The fact is that some files were created on Mac, and others on PC, so TortoiseSVN stopped the commit with an annoying Inconsistent line ending style error.

In the beginning, to solve this problem, I manually opened the incriminated file in , added one blank space, removed it and saved the file so Netbeans converted properly all line ending chars, but it seems there's more than "some files" incriminated.

Of course I searched the web for a solution but I haven't found any suitable for Windows environment.

I'm currently banging my head against the walls.

Answer

Tuan picture Tuan · Jun 2, 2013

Under Windows 7, you can use Notepad++ v5.6.8 to convert EOL

Edit --> EOL Conversion --> Windows / Unix / Mac

Related questions

Getting Access denied on 'db\txn-current-lock' on commit SVN on Windows

I am running VisualSVNServer on a remote server (Server 2007 R2) and Tortoise SVN 1.6.12 x64 on my Windows 7 machine. I have set up a repository on the server and am able to rep-browse to it and checkout. When I add files (…

Read More
Subversion unbearably slow on Windows 7

My company is currently using TortoiseSVN 1.6.16 32-bit on Windows XP to connect via HTTPS to a VisualSVN-Server 2.1.19 running on a Windows Server 2003 residing in the same network (no proxy). We use a self-signed certificate and Kerberos authentication using windows credentials (…

Read More
Setting up Tortoise SVN Windows 7 hotkeys

How would one go about setting up some hotkeys for commonly used SVN actions such as diff? Currently to view diff, I have to select file(s), then right click, navigate to TortoiseSVN and then select Diff action. Quite a …

Read More