Continuous integration with multiple branch development

Posted by ryanprayogo on Stack Overflow See other posts from Stack Overflow or by ryanprayogo
Published on 2010-04-23T20:01:19Z Indexed on 2010/04/23 20:03 UTC
Read the original article Hit count: 265

Filed under:

scm

|

continuous-integration

|

version-control

|

hudson

|

best-practices

In the project that I'm working on, we are using SVN with 'Stable Trunk' strategy. What that means is that for each bug that is found, QA opens a bug ticket and assigns it to a developer. Then, a developer fixes that bug and checks it in a branch (off trunk, let's call this the bug branch) and that branch will only contain fixes for that particular bug ticket

When we decided to do a release, for each bug fixes that we want to release to the customer, a developer will merge all the fixes from several bug branch to trunk and proceed with the normal QA cycle.

The problem is that we use trunk as the codebase for our CI job (Hudson, specifically), and therefore, for all commits to the bug branch, it will miss the daily build until it gets merged to trunk when we decided to release the new version of the software. Obviously, that defeats the purpose of having CI.

What is the proper way to fix this issue?

© Stack Overflow or respective owner

Related posts about scm

SCM for Xcode?

as seen on Stack Overflow - Search for 'Stack Overflow'
I am developing an application for the Mac as a small team (me + another person) effort. We are located in different cities, and have started to see the need for solid source control management. None of us have any experience with this, and both of us are relatively new to Cocoa/Obj-C/Xcode (but… >>> More
.xcodeproj does not get committed with XCode's SCM Tool

as seen on Stack Overflow - Search for 'Stack Overflow'
I am using the SCM Tools embedded in XCode to manage my app's versioning. I have created an iPhone app and I have added/committed it to the Subversion server but the .xcodeproj file won't upload (all the class files, resources etc are there)! I don't even get the option to "Add to Repository". Sometimes… >>> More
Free SCM for Matlab 64 bit version on Windows

as seen on Stack Overflow - Search for 'Stack Overflow'
When Matlab is installed in its 64 bit version, it can use only 64 bit source control systems. Is there a source control system that's free, works with 64 bit Matlab and runs on Windows? It can be a system that supports only one developer. It can be 32 bit itself, if it'll work. It will be installed… >>> More
BES Express - configure MDS to push messages from 3rd party web application

as seen on Server Fault - Search for 'Server Fault'
Hi! I have developed IIS web service to send PAP messages using Blackberry Push API over MDS. And there is an application installed on device, configured to receive push messages on appropriate port. Everything works well on MDS simulator. But it's not working well in real environment: I have installed… >>> More
Plastic SCM vs. SVN

as seen on Stack Overflow - Search for 'Stack Overflow'
I'm currently researching new source control options for a team of 10 developers. We do .net development in Visual Studio 2008. We currently use VSS for source control. We are looking for a centralized source control solution(non-distributed), with a nice Visual Studio plugin. My manager has recommended… >>> More

Related posts about continuous-integration

List of resources for database continuous integration

as seen on Simple Talk - Search for 'Simple Talk'
Because there is so little information on database continuous integration out in the wild, I've taken it upon myself to aggregate as much as possible and post the links to this blog. Because it's my area of expertise, this will focus on SQL Server and Red Gate tooling, although I am keen to include… >>> More
CruiseControl [.Net] vs TeamCity for continuous integration?

as seen on Stack Overflow - Search for 'Stack Overflow'
i would like to ask you which automated build environment you consider better, based on practical experience. i'm planning to do some .Net and some Java development, so i would like to have a tool that supports both these platforms. i've been reading around and found out about CruiseControl.NET,… >>> More
Tech Article: Oracle ADF Essentials - Continuous Integration with Hudson

as seen on Oracle Technology Network - Search for 'Oracle Technology Network'
The basics of installing and configuring the Hudson integration engine to continuously build and test Oracle ADF applications >>> More
Continuous Integration with TeamCity

as seen on Dot net Slackers - Search for 'Dot net Slackers'
TeamCity is a CI server that has been gaining popularity in the .NET community for the last few years. It is packed with handy futures which we will discuss in a minute and has a free version suitable for smaller teams. >>> More
Continuous Integration with Hudson

as seen on Oracle Technology Network - Search for 'Oracle Technology Network'
New technical article >>> More