Blog Archives

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

Mercurial: “proper” ssh support added

Until now, Mercurial only supported tunnelling over an ssh connection when pushing changes to a remote repository. Matt just committed some changes that lets all commands that talk to other repositories work over ssh tunnels.
Posted in mercurial, software

Mercurial: “locate” command added

I implemented a locate command that finds files in a repository by pattern. Here’s a simple example: $ hg locate ‘*.c’ mercurial/bdiff.c mercurial/mpatch.c
Posted in mercurial, software

Mercurial snapshot builds for Fedora Core

I have started doing regular automated builds of Mercurial, and packaging up the results for Fedora Core 2 and 3. These builds are performed four times a day, and the results are available here. Due to the vagaries of my
Posted in mercurial, software

Mercurial: RSS feeds added

Goffredo Baroncelli has contributed a patch to add RSS 2.0 support to Mercurial‘s HTTP serving capabilities. This means that you can subscribe to a Mercurial repository using the RSS feed reader of your choice, and be notified when someone publishes
Posted in mercurial, software

Mercurial: “revert” command added

I have implemented a revert command that lets you undo uncommitted modifications.
Posted in mercurial, software

Mercurial hacking

Since I started looking at Mercurial a few days ago, I’ve been hacking quite heavily on it. I’ll try to make some time to write about it here, but much of what I’ve been doing is documented on the Mercurial
Posted in mercurial, software