Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

How should I Fix "svn: Inconsistent line ending style"?

When I run "svn propedit svn:ignore ." at the root of my svn repository, I get this error: svn: Inconsistent line ending style

I have tried to run this script: http://blog.eflow.org/archives/130 which runs dos2unix and sets the eol-style on all of the files, however this problem still persists. Any idea what could be wrong?

like image 272
Kelvin Avatar asked May 27 '09 18:05

Kelvin


2 Answers

In my case, svn:eol-style property was set on a file. And "some lines of the file were separated by UNIX line endings (LF character), while others were separated by DOS-style line endings (CR+LF characters)". Here is another detailed discussion of this problem.
"Edit"->"EOL Conversion"->"Windows format" in Notepad++ solved the issue for me.

like image 56
evgeny9 Avatar answered Oct 05 '22 23:10

evgeny9


In my case I was editing in Windows. To fix:

  1. Open file in Notepad++
  2. Convert line ending to Unix (Edit menu -> EOL Conversion -> Unix)
  3. Save
  4. Convert line endings to Windows (Edit menu -> EOL Conversion -> Windows)
  5. Save

This did it.

like image 29
Marius Matioc Avatar answered Oct 05 '22 23:10

Marius Matioc