SVN有关分支机构和第三方供应商分支机构的问题 [英] SVN Question regarding branching and third party vendor branching

问题描述

我们正在开发一个包含以下内容的应用程序：

We are developing an application which consists of:

• 合作伙伴很少给我们的源代码库。这是某种可行的代码，是某些东西的最终版本（我们将其保存为zip文件）。他们有自己的发布周期和版本跟踪。


• 在上面的代码库中，我们进行了更改。这些可以是错误修复，也可以是新功能的开发。

到目前为止，我们设法创建了一些代码混乱的地方，结果我们将喜欢将所有这些都放在SVN存储库中。我想问您，您认为减轻痛苦的最佳方法是什么？

Till now, we managed to create some code mayhem, as a result we would like to put all this in a SVN repository. I would like to ask you what you think is the best practice for this to happen with the less pain.

以下是我们认为重要的事情：

The followings are our things that we consider important:

• 我们想跟踪我们的错误修正/更改，因为我们无法将错误修正发送回我们的软件供应商，但是我们可以报告错误（而且他们可能可能无法解决）。我们对他们的代码开发的所有内容仍然是内部，他们对更改不感兴趣。


• 只要我们没有从供应商那里获得新的代码库，我们就会考虑他们的最新消息。版本将成为我们正在开发的稳定版本。这可能会进一步分支，但结果始终是稳定的主干，构建是基于此稳定主干进行的。


• 当供应商发布新版本时，我们希望将我们的稳定主干（包含很多更改）与其更改合并，从而创建一个新的稳定主干。


• 对于我们（向客户端）部署的每个版本，我们应该后来能够仅针对该版本修复错误，对于使用该特定版本安装了我们系统的客户


• 有更多的开发人员正在使用代码库...（照常：）

• We would like to track our bugfixes/changes since we cannot send back bugfixes to our software vendor, but we can report a bug (and they might or might not fix it). All we develop on their code remains "in-house" they are not interested in our changes.
• As long as we don't get a new codebase from the vendor, we consider their latest version to be the stable one we are working on. This might be branched down further, but the result is always a stable trunk, the build is done based on this "stable" trunk.
• When the vendor releases a new version we would like to merge our "stable" trunk (which contains a lot of changes) with their changes, thus creating a new "stable" trunk.
• For each version we deploy (to clients) we should be able later to fix bugs only on that version, for clients who have installed our system using that specific version
• There are more developers working on the codebase... (as usual :)

非常感谢。

推荐答案

SVN本书涵盖了在以下情况下该方案的最佳实践供应商分支。

The SVN book covers the best practices for this scenario under the section Vendor Branches.

这篇关于SVN有关分支机构和第三方供应商分支机构的问题的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！