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

Re: Icon overlays description in manual

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-07-24 14:54:40 CEST

On 7/23/07, Olivier Lefevre <lefevrol@yahoo.com> wrote:
> Unless I missed it or I misunderstood SVN status definitions, it seems
> to me that there is a gap there: by construction you can have only one
> overlay per icon and Tortoise imposes a 1-to-1 mapping of overlay to
> status (i.e., no "composite" overlays) but sometimes more than one
> status applies, e.g., a directory could qualify for both the modified
> and deleted overlays. Thus there must exist a priority order among
> overlays inside Tortoise but the manual does not spell out what it is.

Well, it's complicated.

Each status has a priority. The higher priority wins. Don't forget
that even if you see a 'modified' status overlay, it doesn't mean that
the file contents have changed - maybe only the properties have
changed. Here too, the higher priority of the text and property status
wins.

The priorities are (first mentioned has highest priority):

'conflicted' overlay:
                obstructed
                conflicted

'modified' overlay:
                merged
                modified
                replaced

'deleted' overlay:
                deleted
                missing

'added' overlay:
                added

'normal' overlay:
                external/normal
                incomplete

'needs lock' overlay:
                normal (property set or file rights readonly)
'locked' overlay:
                normal (working copy owns the lock)

no icon overlay:
                ignored
                unversioned
                none

But it gets more complicated:
If TSVN discovers that there are other overlay handlers installed (it
scans the registry and counts them), it prevents the shell from
loading all its handlers so other handlers can be loaded.
if more than 12 handlers are installed, 'added' will be replaced with
'modified', and 'locked' with 'normal'.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Jul 24 14:53:29 2007

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