工作副本根目录以外的路径上的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中删除了所有mergeinfo属性(然后恢复了对根的更改)，然后问题消失了.

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.

所以问题是，我的分支如何在子目录级别获得所有这些mergeinfo更改?

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屋！