Search code examples
svnwindows-7tortoisesvnvisualsvn

TortoiseSVN working copy folder with conflicts but file list is empty

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

In the windows explorer , I can see one of my folder with the little red circle (like there is a conflict).

So I do:

Righ click on the folder -> TortoiseSVN -> Resolved

and then a window titled "resolve" appears telling me "file list is empty"

So I click "Ok" and my folder is still has the red circle,

When I try "Clean Up", my folder is marked as ok (green circle), but if I go to the parent directory and come back, the red circle reappears.

Maybe I didn't understand well how svn is working, but it's really strange.

Thanks.

Solution

  • little red circle doesn't mean conflict, it means that there's a modification. Use the check-for-modifications dialog to see what exactly is modified.