在Subversion中管理分支 [英] Managing branches in subversion

问题描述

我认为我做的不对。我将Subversion用作我们组织网站的vcs。我是唯一的开发人员，并且使用Bugzilla作为我的错误跟踪系统。我使用bugtraq属性将bugzilla和svn进行了松散耦合，以便可以将我的评论链接到bugzilla。我现在正在做的是，每当我收到请求执行网站上的任何工作（增强功能，修复程序，内容更改）的请求时，便在bugzilla中创建了错误[xx]，然后创建了一个名为bug [xx]的分支。完成任务后，我将分支更改手动导出到我们的Beta站点，对该更改进行了审查和验证，然后使用bugtraq属性将分支合并回主干，以指示bug＃。

I don't think I'm doing something right. I am using subversion as my vcs for our organizations website. I am the sole developer and I'm using bugzilla as my bugtracking system. I've got bugzilla and svn loosely coupled using the bugtraq properties so that I can link from my comments to bugzilla. What I'm doing right now is whenever I get a request to perform any work on the website (enhancement, breakfix, content change) I create a bug [xx] in bugzilla then create a branch named bug[xx]. After I complete the task I manually export the branch changes to our beta site, the change is reviewed and verified then I merge the branch back into trunk indicating the bug# using the bugtraq property.

这很好用，除非我有一个或两个以上的更改。如果我为10个工作请求创建了10个分支，那么我想知道如何轻松区分哪些分支已经合并到主干中，哪些不是。如果我应该使用似乎很疯狂的mergeinfo属性...

This works pretty well Except when I have more than one or two changes. If I created 10 branches for ten work requests I want to know how to easily tell which ones are already merged into trunk, and which ones aren't. If I'm supposed to use the mergeinfo property that seems crazy...

我不想从Subversion切换，所以不要建议。

I'm not wanting to switch from subversion, so don't suggest it.

推荐答案

为什么不将分支重新集成到主干中就删除它？重新集成功能分支后应该执行的操作（通常）。因此诊断很简单：如果分支存在，则尚未重新集成。

Why don't you just delete the branch when it has been reintegrated into the trunk? That what you're supposed to do (in the general case) when a feature branch has been reintegrated. So the diagnostic is simple : if the branch exists, it hasn't been reintegrated.

这篇关于在Subversion中管理分支的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！