MarmotBlog

Starting today, Marmot will move to the “basically unstable” strategy of branching. All development will be done on the trunk, and releases will be branched off when appropriate. This should make it much easier to manage releases, bug fixes, and development simultaneously.

The major advantages here are:

• Deployment is done from a tested branch. Changes on this branch will be only bugfixes.
• Development is back to a single stream, on the trunk. Release bugfixes will be merged back to the trunk.
• Switching between branches is only done for upgrades on deployment servers. Such upgrades are only as common as releases and are well-planned.

The current schedule is somewhat close to:

• Today - commit any remaining changes in Marmot development sandboxes, merge dev_1-1_branch back to the trunk, update Marmot development sandboxes with -A to switch them back to the trunk
• March 1 - branch off 1.1 to a release branch, deploy to application development servers, begin testing and QA
• March 15? - 1.1 Release (probably up to 1.1.1 by this point). Update application deployment servers to the new 1.1 release branch.