Annoying problem with "cvs update -Pd" in /usr/src building current

[pimin inwa <pimininca%gmail.com@localhost>]

I'm seeing this annoying situation with cvs, especially after a failed build (as described in another thread).  

cvs update: Updating usr.bin/ktrace/kdump

cvs [update aborted]: could not chdir to usr.bin/ktrace/ktrace: Not a directory

I find I have to remove these files in order to proceed:

 rm -fr  usr.bin/ktrace/ktrace  usr.bin/man/man usr.sbin/mrouted/mrouted  usr.sbin/racoon/racoon

Where am I going wrong?

Paul