乌龟 svn 总是合并 45 个额外的文件 [英] tortoise svn always merging 45 extra files

问题描述

当我们使用 svn 进行分支和合并时，总是会发生同样的事情.

When we do our branching and merging with svn, we always have the same thing happen.

我们得到了行李箱的最新副本.

We get a latest copy of the trunk.

创建一个分支并切换.

对分支中的一个文件做一些小改动.

Make some small change on one file in the branch.

将分支合并回主干.

此时，我们将有一个需要提交的文件，以及同样的 45 个额外文件.这发生在每个分支和合并上，并且总是相同的 45 个额外文件.我不知道如何解决这个问题，但它非常烦人.

At this point, we'll have our one file that needs to be comittied, plus the same 45 extra files. This happens on every single branch and merge, and its always the same 45 extra files. I have no idea how to fix the problem, but its extremely annoying.

有没有人见过这个?

更新:当我提交时，我实际更改的文件的文本状态为已修改，属性状态为空白.45个文件"都是文本状态正常，属性状态已修改.

UPDATE: When I do the commit, the files that I actually changed have their Text Status as modified and their property status as blank. The "45 files" are all Text Status normal, Property Status modified.

推荐答案

它们可能是 mergeinfo 属性.在 SVN 1.5 版中，设置 mergeinfo 属性非常激进，并且在您合并时，这些属性会更新 - 需要提交.

They're probably mergeinfo properties. With version 1.5 of SVN, it was quite aggressive with setting the mergeinfo property, and as you merge, those properties get updated - requiring a commit to them.

答案是删除它们的 mergeinfo 属性.同时升级到 1.6 版，它具有更好的 mergeinfo 支持(即它编写的这些属性更少).

The answer is to delete the mergeinfo property from them. Also upgrade to version 1.6 which has better mergeinfo support (i.e. it writes less of these properties).

我应该说，如果您查看差异，这些文件将没有可见的更改.显然，如果它们的内容发生了变化，那么变化是什么可能会给你一个线索(例如，是一个自动工具，用于编写额外的注释、修改布局或在顶部或底部添加线条).

I should say that these file will have no visible changes if you look at the differences. Obviously, if their contents are changed, then what the changes are may give you a clue (e.g. is an automated tool writing extra comments, modifying the layout or adding lines to the top or bottom).

编辑:见这个有关 SVN 合并问题和修复的更多信息，请参阅博客文章.

这篇关于乌龟 svn 总是合并 45 个额外的文件的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！