SVN Mergeinfo properties on paths other than the working copy root

前端 未结 2 537
借酒劲吻你
借酒劲吻你 2020-12-02 16:47

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 proper

相关标签:
2条回答
  • 2020-12-02 17:24

    At least one part of this bug was fixed in Subversion 1.5.5. From the 1.5.5 CHANGES file:

    do not create mergeinfo for wc-wc moves or copies (r34184, -585)

    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.

    0 讨论(0)
  • 2020-12-02 17:42

    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.

    0 讨论(0)
提交回复
热议问题