Maybe you could avoid these mistakes by using Bitkeeper, just a suggestion :-)
Actually, back in my CVS days I never send patches out made from a tree unless I've just done a "cvs -q -z9 update -d ." on that tree and verified I had no pending crap in it.
