Synchronizing Projects Across Two CVS Repositories?

pavlos asks: "In a few days, part of our development team is going to a remote site to integrate our product with the customer's hardware. We can't move the whole team over there, so during the integration phase both the remote team and the team staying at home will need to commit changes to the software. An encrypted connection to the remote site exists, but is slow and unreliable. The remote team will be taking a Linux CVS server with them as an autonomous solution." The problems occur when it comes time to merge the changes made at the remote site with changes at the central office. What are the best ways to merge changes from a single project from two different CVS repositories?

"We can periodically back up the remote CVS repository using rsync. However, what we would really like is the following behaviour:

1. Each of the local and remote teams work with their own CVS servers. Only the one at the office is backed up.
2. Automatically, when one team commits a change, it is checked out from that CVS repository and committed to the other CVS repository.
3. If the previous step generates a conflict, the developers are asked to merge manually.

Any ideas? Has anyone used CVS in such a manner? Are there any scripts out there which can automate this process?"