[cdv-devel] Wiki being edited, and new merge code up

There's a wiki for all things revision control up at revctrl.org now, and
a number of us are actively maintaining it.

After much consideration, we've figured out that supporting implicit undo
has a number of problems, and it turns out that supporting convergence is
fairly straightforward, so the conclusion from the observation that
implicit undo and convergence don't work well together is that it's best
to start with convergence and later add a limited form of implicit undo,
rather than the other way around.

To that end, I've changed the merge code I posted before to support
convergence instead of implicit undo and also made it produce a real
weave. You can find it here -

http://bitconjurer.org/merge2.py

This code might still have some bugs not found by the tests. It also
doesn't support implicit undo, doesn't resort to a regular LCS for doing
matches when there are no unique lines available, and has the (generally
subtle) line ordering problems endemic to simplistic line-based weaves.

That said, this code *does* support convergence, which in practice means
that it has fairly robust implicit cherry-picking support, a very useful
feature which to my knowledge has never been implemented before, and this
code implements it quite straightforwardly. In lay terms, this means that
you can do your cherry-picking with plain old diff and patch, without even
bothering to explain what you're doing to the version control system, and
it Just Works.

-Bram