TortoiseSVN working folder with conflicts, but the list of files is empty

Question

Context: Windows 7 + TortoiseSVN + Visual Studio 2010 + VisualSVN

In Windows Explorer, I see one of my folders with a small red circle (for example, there is a conflict).

So I:

Righ click on the folder -> TortoiseSVN -> Resolved 

and then a window called "permission" appears, which says that the "list of files is empty"

So, I click “Ok,” and my folder still has a red circle,

When I try to "Clear", my folder is marked as ok (green circle), but if I go to the parent directory and go back, a red circle will appear again.

I may not have a good understanding of how svn works, but this is really weird.

Thank.

Answer 1

a small red circle does not mean conflict, it means that there is a modification. Use the validation dialog box for modifications to see what has been changed.

Answer 2

As Stefan pointed out earlier, overlaying a red circle with an exclamation mark means that either you, or perhaps a working tool, have accessed the file under this folder and edited it.

So now this folder has a local difference than what you last received from the central repository in your last update (but only against your last update , and not against the repository itself in its most current state).

An overlay for a conflict is a yellow triangle with an exclamation mark on it.

=> . You can refer to the documentation section "SVN Icon Overlay Add-in" on the turtle's website ( http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-wcstatus.html ) for a good overview of the various overlays available.

=> Starting the action of the context menu "Check for Changes" provided you with an instant list of states for each file / folder, showing what is happening to them.

Answer 3

Do not worry about the icons - they are not updated regularly. I think that in Windows there is a cache for file and folder icons, and after I do not know something, the icon will be updated.

If you have nothing in the commit list than everything is OK, the icon will eventually be updated.

Answer 4

The folder itself may have properties that svn monitors. One of these properties is svn: exernal, which binds an external repository to the current working copy (one repository inside another).

In case the folder properties conflict, you need to allow the dir-prop-base file in the .svn folder. When you manually resolve the file, as you would for any other file, then you can mark it as resolved from the conflict.