Monthly Archives: August 2005

Slides from distributed SCM talk at Foo Camp 2005 available

I gave a talk on distributed SCMs at Foo Camp last weekend. The slides are now available as a PDF document. The talk was an overview of the current state of the Free Software distributed SCM world; I didn’t concentrate
Posted in scm, software

On distributed and centralised revision control

Ian Bicking has written two thoughtful articles on distributed and centralised revision control systems (the first, the second). His original thesis was one that he shared with Greg Hudson, one of the Subversion developers: for free software, distributed SCM bad,
Posted in scm, software

More about Subversion

[I originally posted this about two weeks ago, but something caused it to disappear. Here's a lightly edited repost.] Karl Fogel posted a comment on my future of free distributed SCM systems entry, asking for some more detail on what
Posted in scm, software

Automatic merging, or how to spend all of your sanity on one problem

Zooko has written a clever article comparing Darcs’s merge strategy with Subversion’s. The essence of the article is a case where two edits to the same file in different branches cause Subversion to automatically do a merge that introduces a
Posted in scm, software

The legacy of BitKeeper

It has now been a month since BitMover withdrew BitKeeper from use by people who didn’t have paid licenses. Ian Bicking has written a blog entry on the evils of distributed revision control, so this seems a good time to
Posted in scm, software

On moving, in a hurry

One of our tenants is about to move out of her apartment in San Francisco. While we wait for the City to digest our plans to build a new house, we have two mortgages to pay; one on the house
Posted in slice-o-life