<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <meta content="text/html;charset=windows-1252" http-equiv="Content-Type"> </head> <body bgcolor="#ffffff" text="#000000"> Mark A. Flacy wrote: <blockquote cite="mid:f131df15ac7b737a678d1f4a7608cff8,1287044503.2775.13.camel@flacy.home.flacy" type="cite"> <pre wrap="">On Wed, 2010-10-13 at 22:05 -0700, Chris Hecker wrote: </pre> <blockquote type="cite"> <blockquote type="cite"> <pre wrap="">But is locking even necessary in this day and age when we can allow merging in most major SCMs? </pre> </blockquote> <pre wrap="">You can't merge most binary files, at least the ones used in game development. How do you merge an mp3? </pre> </blockquote> <pre wrap=""> Then why have files that you can't merge under version control at all? It's almost like using a hammer to drive screws. </pre> </blockquote> That remark is so naive (as is the metaphor), but off the top of my head how about: - because those binary files are part of a larger whole. - because bzr is about MUCH more than merging. - because the binary file versions also need managing - and the best place to do that is together with the files that use them. In the right circumstances using a hammer to drive a screw is the most effective way to work - ask many joiners! It wouldn't work with oak, but with pine the result is strong enough for many purposes. <div class="moz-signature">David. </div> </body> </html>