除工作副本根以外的路径上的 SVN Mergeinfo 属性 [英] SVN Mergeinfo properties on paths other than the working copy root

问题描述

我有一个 SVN 存储库，其中有主干和分支.

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.

在进一步调查中，属性更改是 mergeinfo 属性.我不希望出现这种情况，因为我们总是从顶级根级别分支和合并.

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.

在合并主干之前，我使用了 svn propdel 命令并从分支 WC 中删除了所有合并信息属性(然后恢复了根上的更改)，问题就消失了.

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?

推荐答案

Subversion 1.5.x 添加了许多 svn:mergeinfo 属性，即使是在您认为与合并无关的文件/文件夹中.但是 Subversion 仍然使用这些来减少后续合并的合并时间.

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.

如果你不喜欢那些，你可以安全地从所有不属于合并的文件/文件夹中删除那些修改/添加的 svn:mergeinfo 属性(将它留在工作副本根目录和文件/文件夹中)来自合并的更改).

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).

如果一切按 1.6 版的计划进行，Subversion 1.6 将大大减少 svn:mergeinfo 属性.

Subversion 1.6 will have those svn:mergeinfo properties reduced a lot if everything goes as planned with the 1.6 release.

这篇关于除工作副本根以外的路径上的 SVN Mergeinfo 属性的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！