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

Re: [Locking] svn up and svn st -u output, take 2

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2005-01-06 23:17:42 CET

"Peter N. Lundblad" <peter@famlundblad.se> writes:

> On Thu, 6 Jan 2005, Philip Martin wrote:
>> "Peter N. Lundblad" <peter@famlundblad.se> writes:
>> > svn st -u uses K in the sixth column to show whtether the WC has a lock
>> > (like plain svn status does). It uses column nine to show the repository
>> > state. A space means that the WC and the repository are in aggreement,
>> > that is, if the WC has no lock, the repo has no lock and if the WC has a
>> > lock token, the repo has the same lock token. "!" means the repo has no
>> > lock token (the WC lock was broken) and "~" means that the lock was stolen
>> > and the repo has another token now.
>> Why use two columns? Just use one column:
> svn st -u uses different colummns for WC state and repo out-of-dateness
> already. Consistency.

I guess you mean the '*' field, unlike locks it's hard to see how to
combine that with another column. I still prefer one column for

>> 'K' locked in wc and repository
>> 'B' locked in wc but 'Broken' so not locked in repository
>> 'T' locked in wc but 'sTolen' so some other token in repository
> And for "don't locked in WC, but locked in repository"?

Some other letter? 'H' for 'lock Held' perhaps, 'O' for 'Other lock',
'E' for 'someone Else', we have lots to choose from.

>> If you really want to use two colums I'd prefer something like:
>> K K for locked
>> K B for broken
>> K T for stolen
> This is essentially what is there now,

I thought you were proposing '!' and '~' and ' ' would be used?

> but I used "S" instead of "T" on
> the grounds that being that far away from the switched column would make
> it clear anyway.

I didn't see 'S' in your proposal, but I don't like letters being
reused. If the letters are different I can scan the status output, or
the help text, and quickly recognise the token, if a token is reused
it's harder.

> > Now update can print 'B' when it removes a lock. It could even
> print > 'T' if knows the lock has been stolen, does update have that info?
> It doesn't know the difference. Then I odn't like "B" in this case,
> because it might as well be stolen.

A stolen lock is also broken, I don't see a problem.

Ah, I see now that you were refering to the locking-ui.txt proposal
for 'S', 'T', etc.

Philip Martin
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jan 6 23:18:59 2005

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.