[Monotone-devel] Workspace merge status (SoC)

[Zack Weinberg]

This past week I worked on making _MTN/work hold a revision instead of
a changeset.  Actually, I killed _MTN/work entirely, and _MTN/revision
too; the revision goes in _MTN/workrev.  This makes it easy to tell
whether a workspace has the data in the old format.  It does introduce
a flag day, but only of the form "at some point it will become
impossible to use this workspace with old monotone."  Users don't have
to do anything to upgrade.  I am still chasing the last six test
failures, which are of the odd and inexplicable variety; also I need
to write migration tests, and the code depends on a resolution to the
fake IDs discussion.  See nvm.workspace-merge.api for the current
state of play.

I am tempted to throw it over for a little while and go after the
signal handling problem discussed yesterday.  I'm a bit more sanguine
about a fix for this than njs is.

zw