Branching with Vault to Build with CruiseControl.net

[jkonline]

We are looking into branching with vault.

We would ideally structure our repository with our released code is on the trunk (so we can make minor bug fixes to it then release ) with a single branch for all the new features for the upcoming release (new branch after each release) in the same way described on eric sinks blog http://www.ericsink.com/scm/scm_branches.html

Do you know if it is possible to get CruiseControl.net software to work with vault to build the most recent branch so that we can test our new features before merging them in?

In addition would the build machine require a standard licence?

[Beth]

We have a plug-in for CruiseControl: Vault 4.1.4 Plug-in for CruiseControl.NET.

How the layout is with Eric's description is that the trunk is always moving forward to the next release. For example, we worked on Vault 4.0 in the trunk until it was ready to release, then we branched it. The trunk went onto Vault 4.1.0, while the 4.0 branch released the versions 4.0.0 to 4.0.6. Each release was labeled. When we were ready to release 4.1.0, we branched, and the trunk went onto Vault 5.0. The Vault 4.1 branch released the versions 4.1.0 through 4.1.4. We merge changes from branch to the trunk, but not from the trunk to the branch.

With CruiseControl, you can build the branch also, but you have to specify the path to the branch.

I think most people buy a license for their build machine so that what it is doing can be tracked separately from any users. There isn't anything preventing you from using a regular user account, but you've lost the ability then to know what the Cruise Control machine is doing separate from that user, and they both can't check out the same files even when not using exclusive locks.

[jkonline]

Thanks for you response.

Sorry I wrote my question the wrong way around (so much talking around the subject to day here) I meant to say the complete opposite (as per erics article and my title of the post) with all the new features on the trunk with minor bug fixes on the branches.

As we would need to release the branch with any bug fixes in an emergency we therefore need to build against the branch. With the branch name changes after each release I guess the real question was is there an automated way for cruise control to get the latest branch to build, the plug in to provide only the latest branch or do we have to modify the cruise control config files each time?

Thank you

[ian_sg]

If I understand your question, you have to modify ccnet config files for any new branch.

Answered another way: You have to tell ccnet where to find the code you want built. It doesn't "discover" new branches and decide to build them.

[jkonline]

ok, thought so Thanks

[Beth]

Feel free to let us know if you have further questions.