颠覆分支重新整合 [英] Subversion branch reintegration

问题描述

当分支重新整合到主干中时，该分支是否有效死了?

When a branch is reintegrated to the trunk, is that branch effectively dead?

您可以在重新整合后对分支进行修改，并在以后合并到主干中吗?

Can you make modifications to the branch after the reintegration and merge those back into the trunk at a later date?

推荐答案

您可以从技术上做到这一点，您的分支没有死机也没有被禁用，但是不建议您在重新集成后从分支合并到主干.

You can do it technically, you branch is not dead nor disabled, but it is not recommended to merge from branch to trunk after reintegration.

您可以在此处找到有关其原因的完整讨论: Subversion合并重新整合

You can find a full discussion about the reason for that, here: Subversion merge reintegrate

基本上，它可以再次将更改合并到主干，但是由于重新集成会迫使您在重新集成操作之前从主干合并到分支，因此您将面临反射/循环合并，这是非常有问题的在Subversion 1.5中.
根据文章所述，建议重新整合后立即删除重新整合的分支，并创建一个具有相同(或不同)名称的新分支.

Basically, it says, that it is possible to merge your changes again to the trunk, but since reintegration forces you to merge from trunk to branch prior to the reintegrate operation you'll be facing Reflective/Cyclic Merge which is very problematic in Subversion 1.5.
According to the article, it is recommended to delete your reintegrated branch immediately after reintegration and create a new one with the same (or different) name instead.

这是一个已知的Subversion行为，将在以后的版本中(可能在1.6中解决)

This is a known Subversion behavior which will be addressed in future version (probably in 1.6)

这篇关于颠覆分支重新整合的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！