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

Re: Version 1.4.0: svn st errors out

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: 2006-06-05 19:15:05 CEST

If I'm reading the code correctly, the 1.3.2 version forces repair of
inconsistent line endings, which is good in that it doesn't make this error
show up, but (I'm supposing) bad in that it might keep newline-only changes
from showing up as modifications.

The 1.4.0 version explicitly does NOT repair inconsistent line endings, but
(unfortunately) also doesn't gracefully handle that error condition.

Stefan Küng wrote:
> Hi,
> The following recipe produces an error when running 'svn st':
> $ svnadmin create repo
> $ svn co file:///d:/test/repo wc
> now create two files with some dummy lines in them. One file must have
> CRLF lineendings, the other LF lineendings.
> $ move CRLF-File.txt wc\file.txt
> $ svn add wc\file.txt
> $ svn ci wc -m ""
> $ svn propset svn:eol-style native wc\file.txt
> $ move LF-File.txt wc\file.txt
> Now, we have overwritten the file with CRLF lineendings with a file that
> has only LF lineendings. And the file has the svn:eol-style property set
> to native.
> $ svn st wc
> svn: inconsistent line ending style
> This happens only with an svn.exe compiled from the 1.4.x branch. The
> 1.3.x versions correctly reports:
> M wc\file.txt
> The problem with the 1.4.x behavior is (IMHO) that
> 1. It returns an error. 'svn st' should not error out if the working
> copy is not corrupt. Problems with line endings styles should either be
> reported with some status letter or be ignored in that function.
> 2. The error message is pretty much useless. Imagine you have a working
> copy folder with thousands of files in it and several subfolders: happy
> hunting the file with the "inconsistent line ending style" :)
> Stefan

C. Michael Pilato <cmpilato@collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on Mon Jun 5 19:16:33 2006

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