工作副本根目录以外的路径上的 SVN Mergeinfo 属性
我有一个 SVN 存储库，其中有主干和分支。
我打算定期将主干合并到分支中，但是，当我这样做时，除了实际的文件内容更改之外，我还看到许多属性状态更改。
经过进一步调查，属性更改是 mergeinfo 属性。 我没想到会出现这种情况，因为我们总是从顶层根级别进行分支和合并。
我使用 svn propdel 命令并在合并主干之前从分支 WC 中删除了所有 mergeinfo 属性（然后恢复了根上的更改），问题就消失了。
所以问题是，我的分支如何在子目录级别获取所有这些合并信息更改？
I have an SVN repository where I have trunk and a branch.
I intend to merge the trunk into the branch at regular intervals, however, when I do this I see many property status changes, in addition to actual file content changes.
On further investigation the property changes are mergeinfo properties. I wouldn't expect this because we always branch and merge from the top root level.
I used the svn propdel command and removed all mergeinfo properties from the branch WC (then reverted the change on the root) before merging trunk in, and the problem went away.
So the question is, how did my branch get all these mergeinfo changes in it at sub-directory levels?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
Subversion 1.5.x 添加了很多 svn:mergeinfo 属性，甚至在您认为与合并无关的文件/文件夹上也是如此。 但 Subversion 仍然使用这些来减少后续合并的合并时间。
如果您不喜欢这些，您可以安全地从不属于合并的所有文件/文件夹中删除那些修改/添加的 svn:mergeinfo 属性（将其保留在工作副本根目录以及从合并中获取更改的文件/文件夹中）。合并）。
如果一切按 1.6 版本的计划进行，Subversion 1.6 将使这些 svn:mergeinfo 属性减少很多。
Subversion 1.5.x adds a lot of svn:mergeinfo properties, even on files/folders which you think have nothing to do with the merge. But Subversion still uses those to reduce the merge time for subsequent merges.
If you don't like those, you can safely remove those modified/added svn:mergeinfo properties from all files/folders which were not part of the merge (leave it on the working copy root and the files/folders that got changes from the merge).
Subversion 1.6 will have those svn:mergeinfo properties reduced a lot if everything goes as planned with the 1.6 release.
Subversion 1.5.5 中至少修复了该错误的一部分。 来自 1.5.5 CHANGES 文件：
也就是说，1.5 之前的 SVN 中存在一个错误，它会创建它不使用且多余的 mergeinfo 条目。
At least one part of this bug was fixed in Subversion 1.5.5. From the 1.5.5 CHANGES file:
That is, there was a bug in SVN prior to 1.5 where it would create mergeinfo entries that it didn't use and were superfluous.