Subclipse CollabNet 正在显示一个神秘的图标装饰器
场景：我将 SVN 分支中的一系列精心挑选的修订合并到主干中。我正在使用 Subclipse CollabNet 客户端进行合并。一切都很好，除了我选择合并的文件之外，我的工作目录还显示了一系列 SVN 认为已经更改但我没有选择合并的更改。
如果我对有问题的文件进行比较，它会告诉我没有差异。如果我进行提交，我会得到下面的屏幕截图，其中带有神秘图标，我无法在任何地方找到文档。
截图：
The scenario: I'm merging a series of cherry-picked revisions from an SVN branch into trunk. I'm using the Subclipse CollabNet client to do the merge. Everything works great, except that in addition to the files I picked to merge, my working directory shows a series of changes that SVN thinks have changed but that I haven't chosen to merge.
If I do a diff on the files in question, it tells me there are no differences. If I do a commit, I get the screenshot below, with the mystery icon I haven't been able to find documentation of anywhere.
Screenshot:
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
该图标表示对版本化 SVN 属性进行了修改（不会出现在 Eclipse diff GUI 中）。在本例中，修改是针对 SVN 用于合并跟踪的 svn:mergeinfo 属性。
请参阅此博客文章以获取解释：
http://blogs.open.collab.net/svn/2009/11/where-did-that-mergeinfo-come-from.html
SVN 1.7 将在合并跟踪中进行行为更改，从而消除此问题合并跟踪工作方式的意外方面。
That icon indicates that there are modifications to versioned SVN properties (which do not appear in the Eclipse diff GUI). In this case, the modifications are to the svn:mergeinfo property that SVN uses for merge tracking.
See this blog post for explanation:
http://blogs.open.collab.net/svn/2009/11/where-did-that-mergeinfo-come-from.html
SVN 1.7 is going to have a behavioral change in merge tracking which removes this unexpected aspect of how merge tracking works.