如何处理不同版本的源代码? [英] How to handle different versions of source code?

问题描述

最初我们没有使用任何源代码控制软件.现在我们使用 TFS 2010 进行版本控制.目前，我们面临的问题是如何处理生产代码和正在开发的代码的变更.

假设我们已经使用 Visual Studio 2010 发布了一个 1.0 版到网络，并带有源代码 x.现在我们继续研究源代码以实现更多功能.现在源代码已更改为 x.something.

在此期间，我们收到了用户报告的错误.现在如何处理这种情况，因为必须在源代码版本 x 中修复错误.我们不想使用 x.something 版本，因为它几乎没有我们不想在生产中发布的未完成功能.

此时推荐的做法是什么.

对于不同版本的源代码是否有两个存储库?如果是，那么如何修复错误——首先更新当前版本或已发布的代码，因为我们不希望这些错误存在于当前的开发版本中.

解决方案

查看分支 - 你可以在这里找到一个很好的 guid:

我也喜欢这些，但它们更复杂(太复杂?):(取自 此处 - 仅限德语，抱歉)

Initially we didn’t use any source control software. Now we are using TFS 2010 for version control. Currently we are facing issue related to how to handle changes with production code and code that is under development.

Assuming we have published a version 1.0 to the web using visual studio 2010 publish with source code x. Now we continue to work on the source code to implement more features. Noow the source code has changed to x.something.

During that time we receive bugs reported by users. Now how to handle such situations since bugs has to be fixed in source code version x. And we don’t want to use x.something version since it has few unfinished features which we don’t want to publish on production.

At this time what is the recommended practice.

Are there two repositories for different versions of source code? If yes then how to fix errors when then come –first update current version or the published code, since we don’t want those errors to exist in current development version.

解决方案

look into Branching - you can find a good guid here: TFS Branching Guidance

I think you need/want something like the Branch per Release of Code-Promotion Branches described [here]: or 2

I like those too, but they are more comples (too complex?): (taken from here - only in german sorry)

这篇关于如何处理不同版本的源代码?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！