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

Re: svn commit: r19971 - trunk/subversion/libsvn_wc

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-06-13 21:58:19 CEST

Garrett Rooney wrote:
>> > > For example, if I have an svn:eol-style='native' file and
>> > > change the eol markers to CRLF (which isn't the native format on my
>> > > system) svn st still shows the file as unmodified.
>> >
>> > Umm, as I read the code, shouldn't tihs make it so that if you change
>> > to CRLF it'll show up as modified, since that'll result in an
>> > inconsistent EOL error, which sets same to FALSE....
>> >
>> Only if the eols are truly inconsistent in the file. If I change all
>> eol characters to another eol style, the file shows up as unmodified.
>> When I try this with 1.3.x, it does say unmodified. I think 1.4.x
>> should do the same. Also, I don't think text_modified_p should check
>> for inconsistent eol styles at all, but I think it is better to repair
>> the file on conversion than ignoring the error.

If the error SVN_ERR_IO_INCONSISTENT_EOL is returned only if there are
no other changes, we could just mark the file as unmodified and ignore
the error. But if the error is returned as soon as inconsistend EOLs are
found without checking the whole file for modifications, then that's not
an option.

>> In 1.3.x, inconsistent EOL fail in the commit, but in a later state
>> then the check for modifications state. I'm sceptical to why this is
>> useful, but maybe it catches some user error or something?
> Well, we could just put it back the way it was, repairing the eols. I
> have no strong objection to that, I just assumed that when it was
> changed to not do so there was a reason for it...

Checking the status should never modify a file. At least that was a
consensus a long time ago (with the discussion about 'fixing' file
timestamps with 'svn st' so that unmodified files don't have to be
checked fully every time).
I think it should stay that way ('svn st' *not* modifying/fixing the
file contents).

I'd like to give this issue a high priority. With 'svn st' (more
precise: svn_client_status2()) erroring out, one of the most important
features of TSVN stops working: showing the user a list of modified
files to select from for a commit.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jun 13 22:00:14 2006

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