This sounds a bit complicated. Cvs is your friend. You should run cvs
update before cvs dif, and resolve any conflicts. This way, your diff
is against the most recent version.

I recommend reading the book at http://cvsbook.red-bean.com/

Regards

-- 
Rob Murray

Reply via email to