Currently I'm hacking on doing this properly -- if you make a change to A, it's propogated to B; if you make a change on B, it's propogated to A; if you change the same thing on A and B, you get a conflict raised, with some resolution options.

This scheme works better than rsync in both directions, in the face of a simple renamed file.