* John Goerzen: > On Wed, Aug 31, 2005 at 03:13:30PM +0000, Thaddeus H. Black wrote: >> This is an interesting thread: cvs, svn, arch, tla, baz, >> bzr, git, .. (have I forgotten any?). Lurking, > > Darcs! My favorite tool these days, incredibly easy to use, and seems > to Do The Right Thing (TM) with merges more frequently than arch stuff. > www.darcs.net.
Indeed, darcs is a very nice piece of work. There is a straigtforward workaround for the convergence problem Martin described (push and pull in dry-run mode). Unfortunately, the merge algorithm has some complexity issues, which means that a merge can take eons (literally). But its support for cherrypicking is awesome. It's user interface is nice and comes with useful and up-to-date documentation. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]