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

RE: TSvn 1.7.9 shows incorrect conflicted icon for non-versioned Win7 top-level WC folder

From: Barton Wright <bwright_at_streambase.com>
Date: Wed, 26 Sep 2012 20:26:34 +0000

> [Snip]
> ...
>
> Now, here is the problem:
>
> ·On a machine with all Subversion 1.6.x clients (TortoiseSVN 1.6.16,
> Cygwin svn 1.6.17, and so on), the icons for such symlinked top-level
> WC folders show up in Windows Explorer with the same icon, usually
> green, as the real folder pointed to.
>
> ·However, on a different machine with its own set of WC folders set up
> the same way as the machine above, but using all Subversion 1.7.x
> clients (TortoiseSVN 1.7.9, Cygwin svn 1.7.6, and so on), the icons
> for the symlinked top-level WC folders show as /conflicted/.
>
> Of course, the symlinked folders are not actually conflicted in any way.
> By the magic of symlinks, those folders contain exactly the same
> unconflicted contents as the folder they point to. The proof is that
> the exact same mechanism is handled correctly using TSvn 1.6.x.
>
> I must therefore conclude that the display of icons is broken in TSvn
> 1.7.x for Win7 symlinks that point to top-level WC folders.

>> If you use the check-for-modifications dialog on such a symlink folder, you can
>> see that Subversion reports its status as "obstructed". And that status also has
>> the same overlay as "conflicted" because it usually means that you have to take
>> action to resolve the problem.

Yes, that happens using TSvn 1.7.9. The same thing does NOT happen on an
identical setup using TSvn 1.6.16: you just get the expected list of files from the
folder that the symlink points to.

>> obstructed means
>> "versioned item obstructed by some item of a different kind"

>> you also get that status (example) if you have a file named "test" and
>> an update wants to add a folder named "test" instead.

>> So usually, that's a serious problem and the "conflict" overlay is therefore shown.

Again, none of this happens with TSvn 1.6.16. You must have ADDED this behavior to
the 1.7.x series.

There is no genuinely obstructed folder here. It is a BUG that TSvn 1.7.x thinks there is
an obstruction where there isn't one.

>> No idea on how to better handle this.

How about just handling the situation the way 1.6.16 does?

Stefan

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3010479

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-09-26 22:26:39 CEST

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

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