You do know that "cvs diff" and "cvs commit" work recursively, don't you? Of course. But I always list files just to be safe. The problem was editing in the diff file that I use as my guide: somehow, the parts for stor-layout.c and two of the files in cp got deleted.