Sounds like you are in version controlling hell. Instead of going deeper into hell, back yourself out. Both your offices should be using the same repository. Then you should identify the differences between yours and theirs, document it, and put this documentation under version controlling as well.

Maybe you should look into a third party hoster such as cvs dude or python hosting, to get this up and running cheap and quick.

If cvs isn't meeting your needs, maybe you should try switching over to a more modern system such as subversion. (Both the above offer subversion hosting as well as cvs hosting.)