"inconsistent newlines" - how to fix?

[Anil Das <da...@razor.engr.sgi.com>]

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

Re: "inconsistent newlines" - how to fix?

[Anil Das <da...@razor.engr.sgi.com>]

On Nov 17, 10:46pm, stephen meechan wrote:
> 
> When I have problems with inconsistent eol in text files I delete the
> svn:eol-style property using propdel so I can fix the file. It might apply
> here as well because the property isn't relevant for a binary file.
> 
>-- End of excerpt from stephen meechan

Thanks. That worked!

-- 
Anil Das

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: "inconsistent newlines" - how to fix?

[stephen meechan <mg...@dsl.pipex.com>]

>
> 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?

When I have problems with inconsistent eol in text files I delete the
svn:eol-style property using propdel so I can fix the file. It might apply
here as well because the property isn't relevant for a binary file.



---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org