I've committed my latest version of this work to the new 'reintegrate-keep-alive' branch in r1234919.
I'm working on explaining how this stuff relates to ClearCase's model and the need or non-need for a difference between "reintegrate" and "normal" merges in Subversion. - Julian
