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

Re: [Issue 851] New - cannot diff, revert or status mixed eol file with native svn:eol-style

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-08-05 18:59:14 CEST

Hmmm, it does seem like Subversion is a bit oversensitive, yes! :-)

I think it would be fine to attack this in stages (unless there's some
obvious on-place fix that takes care of everything). For example, we
could fix the revert case first, since it's probably easiest and also
people expect revert to work as a last resort. Then take care of
status next. The diff case is probably going to be the trickiest,
since some translation (for keywords) still needs be done.

Anyway, if you were thinking of starting on it, I just wanted to
suggest this way of breaking it down into small tasks.


blair writes:
> Creating a file with mixed end of lines and setting svn:eol-style to native
> cannot be diffed or reverted .
> cd /tmp
> svnadmin create repos
> svn co file:///`pwd`/repos r
> cd r
> cp /etc/group .
> svn add group
> svn ps svn:eol-style native group
> svn ci -F /dev/null
> cp group g
> unix2dos g
> cat g >> group
> rm g
> svn diff
> svn_error: #21031 : <Inconsistent line ending style>
> ./group
> svn status
> svn_error: #21031 : <Inconsistent line ending style>
> ./group
> What's worse is that I can't even revert the file:
> svn revert group
> svn_error: #21031 : <Inconsistent line ending style>
> ./group

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Aug 5 19:14:40 2002

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.