and
Don't forget that you don't _have_ to do everything in CVS. You could just do an offline diff/patch. But I understand why you want this to work ...