合并并行Subversion存储库中的更新代码 [英] Merging updated code from parallel Subversion repository

问题描述

我想知道人们在将实时(不断更新)的SVN储存库与离线(很少更新)的SVN储存库合并时通常采取什么步骤，例如，以我的情况为例:

I was wondering what steps people generally take when it comes to merging a live (continually updated) SVN respository with an offline one (updated less often), as an example, take my scenario:

前一段时间，我下载了BugTracker.NET系统(版本3.2.3).随后，我对我们的业务代码进行了一些增强.我们使用SVN在源代码控制下开发这些程序.当然，与此同时，仍在继续开发核心BugTracker.NET代码.我基本上希望将BugTracker.NET SourceForge存储库(我认为也是SVN)中的所有更新合并到我自己的内部存储库中.

A while ago I downloaded the BugTracker.NET system when it was at version 3.2.3. I've subsequently make some enhancements to the code for our business. We develop these under source control using SVN. Meanwhile of course, the core BugTracker.NET code has continued to be developed. I basically want all of the updates from the BugTracker.NET SourceForge repository (which I believe is also SVN) merged across into my own in-house repository.

您认为最好的方法是什么?

What, in your opinion, is the best way to go about doing this?

谢谢

安迪

推荐答案

首先，对于这种工作流程，subversion是次优选择，请尝试使用分布式版本控制系统，如GIT，Bazaar等

first, subversion is a suboptimal choice for such a workflow, try a distributed version control system like GIT, Bazaar, etc

如果您必须继续进行颠覆，请使用供应商分支-模式:

if you have to stay on subversion, make use of the vendor-branch-pattern:

• 将新版本导入到 单独的分支
• 将V3.2.3和新版本之间的差异合并到当前主干中(您需要 使用-ignore-ancestry 选项)

• import the new version into a separate branch
• merge the diff between V3.2.3 and the new version into your current trunk (you need to use the --ignore-ancestry option)

这篇关于合并并行Subversion存储库中的更新代码的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！