SVN多次将同一分支重新集成到主干 [英] SVN Reintegrate same branch to trunk multiple times

问题描述

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.

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

In my case I want to keep using the branch after the reintegration to trunk and continue reintegrating to trunk multiple times. I have done this and I have run into two main problems:

1. 当我尝试重新整合时，我不断遇到奇怪的树冲突.
2. 我不断收到一条消息，上面写着只有在之前版本 280 到 325 的情况下才能使用重新集成"

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

How do I get around this issue if I want to be able to reintegrate from a branch multiple times?

推荐答案

您可以使用 --record-only 合并选项，如 SVN 书籍的 让重新整合的分支保持活力

You can use the --record-only merge option as explained in SVN book, section Keeping a Reintegrated Branch Alive

请注意，从 Subversion 1.8 开始，不再需要这样做，因为 自动重新集成合并 被引入.

Note that from Subversion 1.8, this is no longer needed, as automatic reintegration merge was introduced.

这篇关于SVN多次将同一分支重新集成到主干的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！