Good strategies for incorporating an external code drop

Subversion works fine when developers have access to the SVN repo. I'm working on a project where one of the developers for one of the projects doesn't have access to our network. When he makes changes he sends me a zip file with the new contents of the project.

When I incorporate his changes, I've been going through a somewhat manual process, doing a "diff -cr" between the old and new, copying in files that have changes, copying in new files with "Only in <new>" and deleting files with "Only in <old>".

Is there an easier way to do this?
Received on 2011-11-08 21:31:44 CET