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

RE: [TSVN] What overlays do we NEED

From: <Bill.Hughes_at_cgi-europe.com>
Date: 2005-04-14 17:41:05 CEST

Simon Large wrote:
> Bill Hughes wrote:
>> In case 1 'in subversion' would mean you _didn't have a lock - in
>> that case I'd replace 'in svn' overlay with 'no entry', you can't
>> edit it until you obtain a lock.
> But that only works where _all_ files need locking, which is not the
> general case.
Agreed, my cases 1 & 2 were meant to be opposite ends of the spectrum.
In case 1 all files would be set up as needing a lock, while unusual I've
seen a few queries on the list about how to do this. Some (managers?) want
to work this way.

>> In case two you'd show 'no entry'
>> for files where you know another wc has the lock.
> But you never know if another WC has a lock, except by contacting the
> repo, and that's no good for overlays. And the way locking
> works is that
> any file with svn:needs-lock is read-only until you lock it. The fact
> that no other WC has a lock doesn't mean you can edit. You _must_ get
> a lock yourself to be able to edit.
So the default icon here is 'no entry'.

> Maybe you can get a lock without svn:needs-lock, but then no-one else
> knows that locking is in place, so it gives you no protection.
>> BTW I suggest a green key, not a padlock, you have
>> the magic token to open the file.
> Yes, you're right. I said padlocks were a bad symbol only a
> little while
> ago.
It'll do unless/until something better comes along, I suppose.

I think we may only need two overlays and not three. We could drop the 'in
subversion' overlay altogether.
1) File has svn:needs-lock, wc has no lock -> overlay = 'no entry'
2) File has svn:needs-lock, wc does have lock -> overlay = 'green key'
3) the file doesn't have svn:needs-lock, -> 0verlay = 'green key'
i.e. if the overlay is 'green key' the file in the wc can be updated, and
can progress to the other status. If the overlay is 'no entry' the file
can't be updated'

There _need_ be no distinction between 'in svn' and 'you have the lock',
they both mean you can edit the file. Personally I'd prefer to be able to
tell from the overlay that I'm stopping someone else from updating a file or
that someone else has stolen my lock, but that doesn't seem likely from what
I've read earlier.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
*** Confidentiality Notice *** Proprietary/Confidential
Information belonging to CGI Group Inc. and its affiliates
may be contained in this message. If you are not a recipient
indicated or intended in this message (or responsible for
delivery of this message to such person), or you think for
any reason that this message may have been addressed to you
in error, you may not use or copy or deliver this message
to anyone else.  In such case, you should destroy this
message and are asked to notify the sender by reply email.
Received on Thu Apr 14 17:42:23 2005

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

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