pnp.gif

How to use branching to support a hot fix development

J.D. Meier, Jason Taylor, Alex Mackman, Prashant Bansode

Use a Hot Fix branch to create a hot fix for a previously released build.

The following is an example of what your branch structure may look like after you have created a Hot Fix branch:
  • Development – Container for development Branch
    • Feature A
      • Source
    • Feature B
      • Source
  • Main – Integration Branch
    • Source
    • Other Asset Folders
  • Maintenance – Container for release branches
    • Release 1 – Release Branch
      • Source
    • Release 1 - HotFix 1 – Hot Fix Branch
      • Source

Keep the following recommendations in mind when working with a release branch:
  • When to branch: When you are creating a hot fix, create a new branch that can be used to stabilize the hot fix build prior to release.
  • When not to branch: If you will not ever need to maintain the pre hot fix version of the build, you can use a label to mark the old released build and continue work in the release branch.
  • Permissions on branch: Read/write for developers working on hot fixes, read-only for everyone else.
  • Build frequency in branch: On-Demand builds.
  • Testing focus in branch: Sign off on release.

You should use the Hot Fix branch to create targeted changes necessary for a specific hot fix. You might choose to merge these changes into your main integration branch, or leave them specific to the hot fix branch.

Additional Resources

Last edited Mar 22, 2007 at 7:57 AM by prashantbansode, version 5

Comments

No comments yet.