Polarion Software

Lutz Dornbusch, Polarion Software: Advanced Branching and Merging with Subversion

Advanced Branching and Merging with Subversion: Based on our experience as SVN Trainer we will show the pitfalls inusing well established branching concepts from other Versioning Systems, like ClearCase. We also show the open Subversion Training "Subtrain" which is available under subtrain.tigris.org

We will dive into Subversions mergetracking feature and the limitations of the current concept:

• reintegrate merge
• two-tree merge
• cherrypicking

Also we will discuss more advanced techniques like

• blocking revisions from syncing
• subtree merges and mergeinfo consolidation
• blocking clients without merge info
• everse merges

Lutz Dornbusch is a software developer for 18 years, 8 years as a freelancer. He is using Subversion since 2004. Since 2006 he is employee of Polarion and does SVN consulting and Trainings in Countries all over the world.