TortoiseSVN 工作副本文件夹有冲突但文件列表为空
上下文：Windows 7 + TortoiseSVN + Visual Studio 2010 + VisualSVN
在 Windows 资源管理器中，我可以看到我的文件夹之一带有红色小圆圈（就像存在冲突一样）。
所以我这样做：
Righ click on the folder -> TortoiseSVN -> Resolved
然后出现一个标题为“解决”的窗口，告诉我“文件列表为空”，
所以我单击“确定”，我的文件夹仍然有红色圆圈，
当我尝试“清理”时，我的文件夹被标记为好的（绿色圆圈），但是如果我转到父目录并返回，红色圆圈会重新出现。
也许我不太明白svn是如何工作的，但这确实很奇怪。
谢谢。
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.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（4）
小红圈并不意味着冲突，它意味着有修改。
使用检查修改对话框查看到底修改了什么。
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.
正如 Stefan 之前指出的那样，上面带有感叹号的红色圆圈覆盖意味着您（或者可能是正在运行的工具）已访问该文件夹下的文件并对其进行了编辑。
因此，现在此文件夹与您上次从中央存储库获取的最新更新的内容存在本地差异（但仅针对您的上次更新，而不是针对最新状态的存储库本身）。
冲突的叠加层是一个带有感叹号的黄色三角形。
=> 您可以参考 tortoise 网站上的“SVN Icon Overlay”文档部分（http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-wcstatus.html），了解可用的不同叠加层的详细概述。
=> 运行上下文菜单操作“检查修改”将为您提供每个文件/文件夹的即时状态列表，显示它们的实际情况。
As Stefan has indicated earlier, a red circle overlay with an exclamation mark on it means that either you -or perhaps a running tool- have accessed a file under that folder and edited it.
So now this folder has a local difference than what you last got from the central repository on your latest update (but only against your last update and not against the repository itself at its most current state).
An overlay for a conflict is instead a yellow triangle with an exclamation mark on it.
=> You can refer to the "SVN Icon Overlay" documentation section at tortoise's website (http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-wcstatus.html) for a good overview of the different overlays available.
=> Running the context menu action "Check for modifications" would've given you an instant status listing for each file/folder, showing what's really going on with them.
不用担心图标 - 它们不会定期更新。我认为 Windows 有文件/文件夹图标的缓存，在我不知道什么之后，图标会刷新。
如果您的提交列表中没有任何内容，那么一切都可以，图标最终会刷新。
Don't worry about the icons - they aren't updated regularly. I think the Windows has a cache for file/folder icons and after I-don't-know-what, the icon gets refreshed.
If you have nothing in your commit list, than it's all OK, the icon will be refreshed eventually.
文件夹本身可以具有由 svn 跟踪的属性。其中一个属性是 svn:exernal，它将外部存储库绑定到当前工作副本（一个存储库位于另一个存储库中）。
如果文件夹属性发生冲突，您需要解析 .svn 文件夹内的文件 dir-prop-base 。当您手动解析文件时，就像处理任何其他文件一样，您实际上可以将其标记为已解决冲突。
Folder itself can have properties that are tracked by svn. One of such properties is svn:exernal that bindes external repository to current working copy (one repository within another).
In case where folder properties are conflicted you need to resolve file dir-prop-base inside .svn folder. When you manually resolve the file, like you would do for any other file, then you can actually mark it as resolved from conflict.