I'm pretty sure I suggested this in another thread as well - but a diffing / merge app can make this go pretty quick. I like WinMerge personally. Can do folder and file compares, makes it pretty easy to synch everything up.