[Anthill] Do I need Branching, or Is labeling/Tagging Sufficient

[Matt Avery]

Mike,

I am a big fan of branching and patching.  When I have a new feature to 
write, I check out from the head, create a branch, and complete the new 
feature in the branch.  When I am ready to add the feature to the head, 
I create a patch from the command line and then patch the head and check in.

This works great in a production environment where you have at least one 
staging server.  You can deploy branched builds to the dev server for 
testing.  Once the customer tells you what they want in the final 
deployment, you can apply the patches you want to the head and deploy an 
integration build to the dev server for testing.

I use CVS for source control so that's the only system I can offer 
further help with.  Let me know if I can be of further help.


Dunbar, Michael wrote:
> I'd like to hear what techniques you've found successful for fixing bugs in a previous release while simultaneously
> 
> a) Working on the next release
> b) Propagating the bug fix to the next release
> c) Not propagating new code with bug fixes for the previous release
> 
> I'm currently labeling each build (thanks to Anthill), but I'm wondering if I need to make use of branching (one for the previous release, one for next release) as well. The way we did this at the my last job feels to manual, and error prone:
> 
> 1) Fix the bug in the main/only branch
> 2) Extract all files with revision label (or date) of previous release
> 3) Extract the current revisions for the file(s) containing the bug fix, overwriting the versions obtained in step 2.
> 4) Run the build script.
> 
> The big problem I see is that the collection of versions that I've just assembled has no label/tag, or easy way to get back to it if another bug is found. It seems like it would be cleaner to have a maintenance branch for the previous release, where all changes were immediately merged to the main branch. The point of the branch would be to not pick-up changes for the next release, while maintaining the latest bug fix versions of the previous release. I'm hoping it would then be a one-step/automated process to 'build maintenance branch', by supplying a label or something else to denote what revisions to build. I want to leverage Anthill for these maintenance builds, just as I do for my current release builds.
> 
> Does this sound right, or can I achieve what I'm aiming for with the current labels/tags Anthill's been assigning without branching? I use PVCS, in case that impacts your answer.
> 
> Any Input Greatly Appreciated,
> Mike
> _______________________________________________
> Anthill mailing list
> Anthill at lists.urbancode.com
> http://lists.urbancode.com/mailman/listinfo/anthill
> 
> 

-- 
Matthew Avery
Senior Developer
(513) 470-5316
http://www.einnovation.com/