> Is there any automation for this or is it still up to each person > checking in files to copy stuff over by hand?
There is no automation, as neither project was willing to cede control to the other. In general, any patch applied to one repo should be (and may be) applied to the other, but at the moment it's up to each committer to actually do it.
