SVN多次将同一分支重新集成到主干

Question

SVN 书声明如下:

Once you have performed a reintegrate merge you should not continue to use it for development. The reason for this is that if you try to resynchronize your existing branch from trunk later on, merge tracking will see your reintegration as a trunk change that has not yet been merged into the branch, and will try to merge the branch-to-trunk merge back into the branch! The solution to this is simply to create a new branch from trunk to continue the next phase of your development.

在我的情况下，我想在重新集成到主干后继续使用分支并继续多次重新集成到主干。我已经这样做了，但遇到了两个主要问题:

当我尝试重新整合时，我不断遇到奇怪的树冲突。

我不断收到一条消息，上面写着“只有在以前版本 280 到 325 的情况下才能使用重新集成”

如果我希望能够多次从一个分支重新集成，我该如何解决这个问题？

Answer 1

您可以使用 --record-only 合并选项，如 SVN book, section Keeping a Reintegrated Branch Alive 中所述。

请注意，从 Subversion 1.8 开始，不再需要这样做，因为 automatic reintegration merge被介绍了。