Comments on: Branching Strategies: The Cost Of Branching And Merging http://lostechies.com/derickbailey/2010/02/24/branching-strategies-the-cost-of-branching-and-merging/ Better Than Yesterday Thu, 13 Jun 2013 17:35:00 +0000 hourly 1 http://wordpress.org/?v=3.4.2 By: Paul Hammant http://lostechies.com/derickbailey/2010/02/24/branching-strategies-the-cost-of-branching-and-merging/#comment-565 Paul Hammant Wed, 14 Apr 2010 18:18:02 +0000 /blogs/derickbailey/archive/2010/02/24/branching-strategies-the-cost-of-branching-and-merging.aspx#comment-565 Even for Branch by Abstraction projects, you will still have one CI pipeline per branch. Trunk will of course account for 99% of the activity, but you still want CI to watch past and future release branches for those 1% bug-fix-merges. Even for Branch by Abstraction projects, you will still have one CI pipeline per branch. Trunk will of course account for 99% of the activity, but you still want CI to watch past and future release branches for those 1% bug-fix-merges.

]]> By: derick.bailey http://lostechies.com/derickbailey/2010/02/24/branching-strategies-the-cost-of-branching-and-merging/#comment-564 derick.bailey Fri, 26 Feb 2010 16:36:19 +0000 /blogs/derickbailey/archive/2010/02/24/branching-strategies-the-cost-of-branching-and-merging.aspx#comment-564 @Graham, if you are just branching and not worrying out integration while working on the branch, then yes you will cause all kinds of pain. any good branching strategy - by abstraction or otherwise - will have a CI per branch to do continuous integration of the branches and check for integration issues. I have briefly touched on this in previous posts, and am planning a post dedicated entirely to this subject. @Graham,

if you are just branching and not worrying out integration while working on the branch, then yes you will cause all kinds of pain. any good branching strategy – by abstraction or otherwise – will have a CI per branch to do continuous integration of the branches and check for integration issues. I have briefly touched on this in previous posts, and am planning a post dedicated entirely to this subject.

]]> By: Graham http://lostechies.com/derickbailey/2010/02/24/branching-strategies-the-cost-of-branching-and-merging/#comment-563 Graham Fri, 26 Feb 2010 16:08:44 +0000 /blogs/derickbailey/archive/2010/02/24/branching-strategies-the-cost-of-branching-and-merging.aspx#comment-563 The whole point of CI is to surface pain early, in which case surely branching (per-feature or otherwise) is just brushing problems beneath the carpet, to spring back out at an inconvenient point later? (i.e. integration "hell"). In which case, you'd be far better off doing something like branch-by-abstraction - http://paulhammant.com/blog/branch_by_abstraction.html. The whole point of CI is to surface pain early, in which case surely branching (per-feature or otherwise) is just brushing problems beneath the carpet, to spring back out at an inconvenient point later? (i.e. integration “hell”). In which case, you’d be far better off doing something like branch-by-abstraction – http://paulhammant.com/blog/branch_by_abstraction.html.

]]> By: Ed Hintz http://lostechies.com/derickbailey/2010/02/24/branching-strategies-the-cost-of-branching-and-merging/#comment-562 Ed Hintz Thu, 25 Feb 2010 16:42:24 +0000 /blogs/derickbailey/archive/2010/02/24/branching-strategies-the-cost-of-branching-and-merging.aspx#comment-562 TFS branching and merging is much improved, especially in the upcoming release of Visual Studio 2010. You can read about it here: http://blogs.msdn.com/edhintz/archive/2010/01/20/visual-studio-team-foundation-server-branching-guide-2010.aspx TFS branching and merging is much improved, especially in the upcoming release of Visual Studio 2010. You can read about it here: http://blogs.msdn.com/edhintz/archive/2010/01/20/visual-studio-team-foundation-server-branching-guide-2010.aspx

]]>