DenkzeitWiki

Branching

• Streamed Lines: Branching Patterns for Parallel Software Development
  
• Software Branching and Parallel Universes
  • different kinds of
    

• http://martinfowler.com/bliki/FeatureBranch.html
  • Continuous Integration (actually no branching or hardly any: frequently merging small changes to mainline)
  • Promiscuous Integration (merging between branches)

Feature Branching is a poor man's modular architecture, instead of building systems with the ability to easy swap in and out features at runtime/deploytime they couple themselves to the source control providing this mechanism through manual merging.Dan Bodart

• http://paulhammant.com/blog/branch_by_abstraction.html
  • do some refactoring, get truely component-oriented - no need to branch in your VCS
    
  
  
• The Cost of Branching

• Defining Your Branching and Merging Strategy
  • from Microsoft but an OK read...
  
  
• http://producingoss.com/en/release-branches.html
  • Release branches are pretty much required in open source projects, however. I have seen projects do releases without them, but it has always resulted in some developers sitting idle while others—usually a minority—work on getting the release out the door.
  
  
• http://stackoverflow.com/questions/1191764/timing-the-release-branch
  • branch early (the guys that do the progressive code (for future releases) would like that)
  • or branch late (the guys doing the release would like this solution)
  • branching is a heavy process because of all the merging that results

TeamFoundationServer

• Recommendations in SCM Branching Patterns in TFS
  • Branch-by-Release
  • Branch-by-purpose
  
  
• Branching models
  • http://www.seapine.com/pub/papers/SCMBranchingModels.pdf

books, papers

• http://www.seapine.com/pub/papers/SCMBranchingModels.pdf