concurrent development, two repositories

[Jeffery Lin]

I am part of a software project that involves two development teams working on the same code base. The MAJOR catch is that these two teams (for legal, corporate, and whatever reasons beyond my control) cannot share the same CVS repository. So we develop separately, then every few weeks they send us a "patch" and I have to merge the two code bases.

What I currently do is put their code on a branch then use the Eclipse Synchronization view to compare our trunk to the branch. Usually there are about 1,000 differences, and I go through each one manually to decide whether we need the change merged into the trunk.

Is there an easier way to do this?!

Jeff