Subversion Merge: Unchanged file showing as changed

I do my development in a development branch and then merge into trunk before creating a tag for release. I've been finding that one file continually shows up as changed when committing after the merge. It has not changed. I am posting this in hope that someone else has experienced the issue and knows what is going on.

在开发分支中进行开发，然后在创建发布标签之前合并到主干中。 我一直发现在合并后提交时，一个文件不断显示为已更改。 它没有改变。 我发布这个是希望其他人遇到过这个问题并且知道发生了什么。

It's the svn:mergeinfo property which is being updated. See this other question.

To summarize: either ignore it and just commit, or delete the svn:mergeinfo property on that one file. And follow the merging advice in the SVN book so that you confine such properties to the root of your project tree as much as possible.

update: This appears to be fixed in SVN 1.7. From the release notes: reduced subtree mergeinfo

这是正在更新的 svn:mergeinfo 属性。 请参阅另一个问题。

总结一下：要么忽略它并提交，要么删除该文件的 svn:mergeinfo 属性。 并遵循 SVN 书中的合并建议，以便尽可能地将这些属性限制在项目树的根目录中。

更新：这似乎已在 SVN 1.7 中修复。 来自发行说明：reduced subtree mergeinfo