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

"inconsistent newlines" - how to fix?

From: Anil Das <das_at_razor.engr.sgi.com>
Date: 2004-11-17 23:19:37 CET

Hi,

We are running subversion 1.1.1. There is a binary file (x.fig)
that was checked into the repositoy. Subversion does not
seem to have recognized it as being binary. It has no mime-type
set.

There has already been two revisions of the file. However, when
I try to check in the lastest revision, I get

Sending x.fig
Transmitting file data .svn: Commit failed (details follow):
svn: File '/home/das/src/x.fig' has inconsistent newlines
svn: Your commit message was left in a temporary file:
svn: '/home/das/src/svn-commit.tmp'

After some googling and looking at archives of this mailing list,
I figured this might be happening because the file is not recognized
as binary. So I used propset to set the mime type of the file
to image/x-xfig. I committed the property change. Checked out the
file fresh and tried to check it in again with the new revision.
I still get the same error message. And if I try to revert:

svn: Error restoring text for 'x.fig'
svn: File '.svn/text-base/x.fig.svn-base' has inconsistent newlines

Here is the property list.

% svn proplist -v x.fig
Properties on 'x.fig':
  svn:executable : *
  svn:mime-type : image/x-xfig
  svn:keywords : author date id revision
  svn:eol-style : native

So, what do I do at this point? How do I recover? What can I do to this
file, so that I can check in new versions?

Thanks.

-- 
Anil Das
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Nov 17 23:26:17 2004

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