Progress, buy stymied by subversion

[Benson Margulies <bi...@gmail.com>]

In my branch, all the tests pass.

However, I'm somewhat stumped. Recall that my idiot procedure was

a) check in first round of changes to the trunk.
b) branch those.
c) reverse merge them out of the trunk.
d) debug them on the branch.

I seem to have made a mess bigger than svnmerge.py can repair.

I might do worse than to just diff the two trees and apply the
resulting patch. We'll see.