Subversion

Software systems that represent newlines or line endings differently can sometimes cause problems

A newline or line ending is the invisible character at the end of a line, inserted when you type "return" or "enter", that signals, "go to the next line". Wikipedia has a more complete description of Newlines

Subversion tries to solve these problems by normalizing line endings according the operating system you're using, so on Windows, Subversion creates files with Windows line endings, and on Mac or Linux it creates files with Mac or Linux line endings

Subversion handles any file with consistent line endings - Mac line endings on Windows? No problem. Windows line endings on Linux? No problem.

The one thing Subversion can't handle is a file with "inconsistent line endings" - a file with a mix of *both* Mac and Windows line endings, for example

When this happens you need to make all the line endings consistent - either all Mac or all Windows or etc.

Happily these instructions, from Newline, worked on Windows,

Create a shortcut on the desktop to the old MS-DOS Editor program, which still ships with modern Windows versions,


 * 1) Right click on the desktop, select "New" -> "Shortcut"
 * 2) Type "edit" in the "Type the location of the item:" field
 * 3) Click "Next >"
 * 4) Click "Finish"

The above steps only need to be done once - now you can use the shortcut you created on the desktop to fix files' line endings,


 * 1) Drag the file on top of the "MS-DOS Editor" shortcut on the desktop
 * 2) Click "File" -> "Save"
 * 3) Click "File" -> "Exit"

The file should now have consistent line endings, which Subversion can handle