Best branching strategy when doing continuous integration?

Posted by KingNestor on Stack Overflow See other posts from Stack Overflow or by KingNestor
Published on 2009-02-28T07:44:15Z Indexed on 2010/03/21 7:21 UTC
Read the original article Hit count: 464

Filed under:

svn

|

scm

|

branching

|

continuous-integration

|

version-control

What is the best branching strategy to use when you want to do continuous integration?

Release Branching - Unstable Trunk:

alt text

or

Feature Branching - Stable Trunk:
alt text

Does it make sense to use both of these strategies together? As in, you branch for each release but you also branch for large features?

Does one of these strategies mesh better with continuous integration? Would using continuous integration even make sense when using an unstable trunk?

© Stack Overflow or respective owner

Related posts about svn

`svn checkout` on the SVN server causes the repo to break with a 301 error

as seen on Server Fault - Search for 'Server Fault'
We have an nginx server which proxies to a standard set-up of Apache+SVN. The nginx set-up is a very simple proxy: server { server_name svn.ourdomain.tld; location / { proxy_pass http://localhost:8080; } } Apache is set-up as follows: <Location /> DAV svn SVNParentPath… >>> More
Can't create directory named "mysql" in subversion repository

as seen on Server Fault - Search for 'Server Fault'
I have a particular problem with subversion. Environment: subversion (1.6.12dfsg-6), apache2 (2.2.16-6+squeeze7) + mod dav_svn. I can't create a directory named "mysql" or "testmysql" or add and commit a file named "mysql.txt" in my repository. There are many references to "subversion PROPSET 403… >>> More
Using AuthzSVNAccessFile for controlling SVN Access produces HTTP 400 Bad Request

as seen on Server Fault - Search for 'Server Fault'
I have a new repository on an existing subversion server that requires us to perform path based authorization within the repository. I found that the AuthzSVNAccessFile directive in apache is directly responsible for allowing this functionality. After fixing several other problems such as AuthzSVNAccessFile… >>> More
Multi Svn Repositories in Apache

as seen on Server Fault - Search for 'Server Fault'
I have a set up with apache and subversion In the apache configuration i have <Location /svn> DAV svn SVNParentPath c:/svn </Location> Now i have multiple repositories a a_b a_c a_b_c a_b_d b and i want to map them as a/svn a/b/svn a/c/svn a/b/c/svn a/b/d/svn b/svn to do… >>> More
SVN Error 403 Forbidden

as seen on Stack Overflow - Search for 'Stack Overflow'
I can't figure this out. I try to import a new project into a svn repository from Netbeans and get 403 Forbidden. I just setup svn on my serverbox today. I can get to it through a browser just fine, though its empty as I haven't imported my project yet. Apache's path for html files is /var/www I… >>> More

Related posts about scm

.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
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
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