https://pesche.schlau.ch/tags/perforce/ Recent content in Perforce on Pesches Schlauch Hugo en Tue, 03 Jul 2007 17:06:15 +0200 https://pesche.schlau.ch/2007/07/03/merge-down-copy-up/ Tue, 03 Jul 2007 17:06:15 +0200 https://pesche.schlau.ch/2007/07/03/merge-down-copy-up/ <p>If you are using any SCM that allows cheap branches (like <a href="http://www.perforce.com/">Perforce</a>) and are following the advices from the <a href="http://www.perforce.com/perforce/bestpractices.html">High-level Best Practices</a> document, you might be interested in (or already know) Laura Wingerd's presentation <a href="http://www.perforce.com/perforce/conferences/eu/2006/presentations/laura_wingerd/ConvergenceVsDivergence.html">Convergence vs. Divergence: Purposeful Merging with Perforce</a> about how to converge to codelines using <a href="http://www.perforce.com/perforce/conferences/us/2005/presentations/Wingerd.pdf">Merge Down, Copy Up [PDF]</a>. I have seen it many times that a main codeline got broken because the Merge Down, Copy Up idiom was ignored.</p>