SVN自动合并到签入分支 [英] SVN Automatic merge to branch on check in

问题描述

我们在即将发布的版本中使用一个分支，在下一个版本(稍后)中使用主干.

We use one branch for the our upcoming release, and trunk for the next release (later).

例如: v1.1-> v1.2->中继 (v1.1正在生产中，v1.2是即将发布的版本，而主干将在发布时更接近v1.3).

For example: v1.1 -> v1.2 -> trunk (Where v1.1 is in production, v1.2 is the upcoming release and trunk will turn into v1.3 closer to release).

在处理即将发布的版本时，我们使用SVN(TortoiseSVN)签入.这样做的问题是，如果所有签入都必须与以后的发行版相关(也就是大多数更改)，则必须将所有签入手动合并到主干中.

While working on the upcoming release, we check in using SVN (TortoiseSVN). The problem with this is that all check ins must be manually merged to trunk if it's a change that will be relevant for later releases as well (Most changes in other words).

问题在于，当开发人员受到压力时，他们往往会忘记合并.这样的结果是，分支中完成的修复可能稍后需要再次修复，因为开发人员忘记了将修复从分支合并到主干

The problem is that when the developers are stressed, they tend to forget to merge. The consequence of this is that a fix which is done in a branch may need to be fixed again later because the developer forgot to merge the fix from branch to trunk

是否有一种方法可以在对分支进行签入时自动将代码合并到中继中?

Is there a way to automatically merge the code to trunk when a check-in is made to the branch?

推荐答案

是的，有可能，并且有一个开源项目可以做到这一点！

Yes , it is possible , and there is an open source project that does it!

签出 https://github.com/liveperson/Auto-Merger

我们一直在使用它，它节省了大量时间，并有助于避免所有那些错过的合并错误.

we are constantly working with it and it saves so much time and helps avoiding all those missed merges bugs.

这篇关于SVN自动合并到签入分支的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！