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

I'm getting "Inconsistent line ending style" and I don't know why.

From: ternto333 <trent.ostler_at_gmail.com>
Date: Fri, 4 Jan 2008 13:17:17 -0800 (PST)

I'll have to admit, I did try and merge a file that had been "DOSified". It
naturally resulted in a conflict when the unix version didn't match the new
DOS version. Once I ran dos2unix on the file, the conflict was resolved so I
used
  svn resolved
Then I ran
  svn commit -m "This is the message".
This all worked fine now and I was going merge the revisions using
  svnmerge merge -r "1846-1850,1852-1853"
which worked and it produced a svnmerge-commit-message.txt. I then used that
file to commit by using
  svn commit -F svnmerge-commit-message.txt
This did not work. It gave the following error:
  svn: Commit failed [details follow]:
  svn: Inconsistent line ending style.
However, most of the examples that I have seen with this problem have
inconsistencies in the file. Mine is a pure and clean unix version with no
windows new lines or anything. I can't see why it is complaining about the
line ending inconsistencies. Did I forget to do something? Is there any way
to temporarily override this syntax requirement?

-- 
View this message in context: http://www.nabble.com/I%27m-getting-%22Inconsistent-line-ending-style%22-and-I-don%27t-know-why.-tp14624991p14624991.html
Sent from the Subversion Dev mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-01-04 22:17:30 CET

This is an archived mail posted to the Subversion Dev mailing list.