https://pesche.schlau.ch/tags/vcs/ Recent content in Vcs 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> https://pesche.schlau.ch/2005/02/07/cvs-with-applesingle-files/ Mon, 07 Feb 2005 10:07:04 +0100 https://pesche.schlau.ch/2005/02/07/cvs-with-applesingle-files/ <p>Longtime Apple developers probably know this intuitively, but I needed some time to figure it out: When CVS-ing files with a resource fork, you <strong>must not</strong> use the <code>/usr/bin/cvs</code> that ships with OS X!</p> <p>Because Apple used to separate data and metadata, most files in the pre OS X era had a data fork and a resource fork, but for the user this was transparent; the user just manipulated one file. Tools without this &quot;Classic&quot; background know nothing of the resource fork. Files without data fork appear in the Terminal to have 0 bytes.</p>