CODEWITHSUNDEEP
svnline-endingseol
Suman
Suman

Reputation:

SVN Line ending Style

When i try to commit the file in SVN its showing error as "Commit failed".Details follow....commit svn: Inconsistent line ending style.

Upvotes: 8

Views: 24236

Answers (6)

Derek Wilson
Derek Wilson

Reputation: 1

I'm using TortoiseSVN in a Windows environment. I got this same error when trying to commit project files, presumably written in Linux (an AVR32 project). I was able to get around this problem simply by opening each file in Microsoft Visual Studio, at which point VS prompted me to normalize the line endings. Choosing to do so caused Tortoise to stop complaining.

Upvotes: 0

rogerdpack
rogerdpack

Reputation: 66711

for followers, here's how to manually set the prop to one or the other:

 svn propset svn:eol-style LF path/to/filename

Upvotes: 1

RollerCosta
RollerCosta

Reputation: 5186

select line end style form your tool(like kdiff) itself...right side bottom(just above the output lines)

Upvotes: 0

dubek
dubek

Reputation: 12097

Check the EOLs in commit message itself: If you pass a commit message from file with the --file switch, make sure the EOL style in the commit message is consistent (all DOS or all UNIX).

Upvotes: 1

left47
left47

Reputation:

Once you're aware of the line ending style svn expects, most modern editors will have options to convert your source completely to one style or another. You can also run regular expressions to detect and alter them (I like Perl for this).

MSDOS EOL: "\r\n"

UNIX EOL: "\n"

Upvotes: 1

drowe
drowe

Reputation: 2320

Check your svn properties on the directory / files. If you have svn:eol-style defined, but your file contains different styles (Unix vs DOS) the commit will fail, since SVN doesn't know which to convert to.

Reference: http://svn.haxx.se/users/archive-2006-07/0702.shtml

Upvotes: 8

Related Questions