Yeah, refactoring in a branch for too long is nuts. I agree with Josh that

it's fine to merge into trunk if you think it's ready. For you, I think the sooner the better.

Well, I think it is. Sometimes the factory issues a warning about rdf:RDF nodes, but as far as I know, Christoffer Holmstedt is currently working on license management and metadata handling. This has no effect on the functionality of the metadata dialogs, though.

Regards, Markus