You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by ternto333 <tr...@gmail.com> on 2008/01/04 21:17:17 UTC
I'm getting "Inconsistent line ending style" and I don't know why.
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@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: I'm getting "Inconsistent line ending style" and I don't know
why.
Posted by ternto333 <tr...@gmail.com>.
>
> What does "svn pg svn:eol-style" do if you run it on that file?
>
>
It doesn't do anything for that particular file of interest. For all other
files in that directory, it displays "native". I don't know if this is a
good or a bad thing.
--
View this message in context: http://www.nabble.com/I%27m-getting-%22Inconsistent-line-ending-style%22-and-I-don%27t-know-why.-tp14624991p14625390.html
Sent from the Subversion Dev mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: I'm getting "Inconsistent line ending style" and I don't know
why.
Posted by Branko Čibej <br...@xbc.nu>.
ternto333 wrote:
> 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?
Yes, you forgot that this is the wrong list for such a question. You
should try users@subversion.tigris.org instead.
> Is there any way
> to temporarily override this syntax requirement?
>
What does "svn pg svn:eol-style" do if you run it on that file?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org