Comments on: Managing feature additions and bug fixes with Subversion http://www.neilcrookes.com/2008/05/06/managing-feature-additions-and-bug-fixes-with-subversion/ Learnings and Teachings on Web Application Development & CakePHP Fri, 03 Feb 2012 19:44:06 +0100 hourly 1 http://wordpress.org/?v=3.1.2 By: cosmin http://www.neilcrookes.com/2008/05/06/managing-feature-additions-and-bug-fixes-with-subversion/comment-page-1/#comment-10032 cosmin Wed, 20 Oct 2010 16:48:54 +0000 http://www.neilcrookes.com/?p=12#comment-10032 Good idea. Currently I have a maintenance branch for the production version and all the new stuff goes into trunk, starting with bug fixes but also including features. I've had some troubles merging larger features that had lots of commits in trunk into the maintenance branch. I decided to keep the mess in trunk so to avoid the large merge nightmares where a dev works too long on a branch and when is time to merge it back into trunk all hell breaks loose. Everybody working on trunk does make everybody keep up with everybody elses changes. But maybe separate branches for features and a clean trunk with only bug fixes is a better idea. As long as everybody keeps their branches up to date with the trunk changes the merging back from a branch intro trunk shouldn't be that painful. Question is how to make them keep up with trunk. But definitely version control is the way to go when you have something live and you need to fix it while also adding new stuff to it. There's just no other way. PS: Thank you for the great articles on Cake, Web development and Agile. Great style and content! Good idea.
Currently I have a maintenance branch for the production version and all the new stuff goes into trunk, starting with bug fixes but also including features. I’ve had some troubles merging larger features that had lots of commits in trunk into the maintenance branch.

I decided to keep the mess in trunk so to avoid the large merge nightmares where a dev works too long on a branch and when is time to merge it back into trunk all hell breaks loose. Everybody working on trunk does make everybody keep up with everybody elses changes.

But maybe separate branches for features and a clean trunk with only bug fixes is a better idea. As long as everybody keeps their branches up to date with the trunk changes the merging back from a branch intro trunk shouldn’t be that painful. Question is how to make them keep up with trunk.

But definitely version control is the way to go when you have something live and you need to fix it while also adding new stuff to it. There’s just no other way.

PS: Thank you for the great articles on Cake, Web development and Agile. Great style and content!

]]>