Fervent Coder

Coding Towards Utopia...by Rob Reynolds
posts - 278 , comments - 431 , trackbacks - 0

My Links


Rob Reynolds

Subscribe to Fervent Coder RSS
Subscribe to Fervent Coder by Email

About Me

I manage several open source projects. Need...
   ...package management for Windows?
   ...automated builds?
   ...database change management (migrations)?
   ...your application to check email?
   ...a monitoring utility?

I also write for

Like what you are reading? Want to buy me a cup of coffee?
PayPal - The safer, easier way to pay online!


Post Categories


Call For Input: Branch Development Syncing Issue

All of the code we write must be tested and accepted by users before it can go into production.  Which brings about a unique possibility of a syncing issue when we are doing so in a branch development scenario.

The image below is a great reference.  Say we have two imaginary branches, one for features and two for production fixes. In reality there would probably be a branch for every production fix and multiple branches for on-going development.  The trunk is code that has been released to production.

We are doing our development in branch one. Every once in awhile we integrate changes from the trunk because it reflects production code (and we want to make sure we have that integrated in our code).We hit a code lock down period before production where all changes need to be tested.  In a branching development scenario, we would need to merge all changes from the mainline BEFORE we start our regression testing (integrate and test). 

This testing before a release to production could take awhile, and by awhile, anywhere from a couple of days to a couple of weeks.  What if after we do our final merge up from the trunk to the branch and begin testing, there is an emergency change that goes into production? Do we pull that back up (integrate the new changes that went into prod) and start our testing over? If there are several issues (that keep requiring emergency fixes), would we ever get out of testing?


Print | posted on Thursday, October 23, 2008 1:34 PM | Filed Under [ Code ]



# re: Call For Input: Branch Development Syncing Issue

Hi -
Just wanted to share my experience here ...
I like to keep the trunk for on going development, and when release a version to production I tag it (I use SubVersion)
When a fix is needed on production, the tag will be converted to a branch, the fix is applied and if needed will be applied (or merged) to the trunk
does it make sense to you !
11/15/2008 4:31 PM | Essam

# re: Call For Input: Branch Development Syncing Issue

Essam: This makes sense, but really doesn't address the question of QA testing an application that has constant production fixes (hopefully not your app).
11/17/2008 11:13 PM | Robz

# re: Call For Input: Branch Development Syncing Issue

Can I have a number to sombody that know how to make htc pro into a modem
8/13/2009 10:47 PM | jeffery
Comments have been closed on this topic.

Powered by: