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

Re: SVN 1.5 Status Update

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: 2007-09-11 14:44:39 CEST

David Glasser wrote:
> On 9/10/07, C. Michael Pilato <cmpilato@collab.net> wrote:
>> Ben Collins-Sussman wrote:
>>>> One we might need to push to a new release if no one steps forward:
>>>>
>>>> 2238: svn propset/del/edit does not support URL argument
>>>>
>>> Argh, are we *still* debating this issue? We already added 'svn
>>> propedit URL' support. I suppose I can understand adding 'svn propdel
>>> URL' support (since we already support 'svn rm URL')... but I'm really
>>> against 'svn propset URL', and the issue claims there's still no
>>> consensus on that. I guess we should at least update the issue's
>>> summary.
>> Just out of curiousity -- what happens when you use 'svn propedit URL' to
>> set svn:eol-style to, say, 'CRLF'? IIRC, the Subversion client would
>> usually normalize the working file to RNF in this case, but (obviously)
>> doesn't have the opportunity to do so in this URL-based propedit case.
>
> Erk. I did make sure to keep the validation code working (ie, the
> propedit will fail if the EOL style is completely inconsistent), but I
> don't think I made it change the text. This is probably broken, then.

Yeah, I followed up in IRC with what happens. It's a little weird.
Basically, the next time folks update their working copies, it seems to be
no big deal. The file whose props were changed is reset to have the right
line-ending style and everything, but the file shows no diffs or interesting
status. However, if you then change anything in that file, suddenly the
whole thing becomes a massive line-ending replacement diff. That means if
two people happen to work on the file simultaneously, the loser of the
commit race will get a whole-file conflict region. :-(

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

Received on Tue Sep 11 14:41:16 2007

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