Over the past two days, I have seen unexpected conflicts appear when 
doing a "cvs update" of my source tree from anoncvs.netbsd.org.  Last 
week, I did one or two updates from a mirror with no apparent problems. 
 Now, when I do an update, I get a number of pairs of messages of the 
form

    cvs update: move away usr.bin/extattr/getextattr.c; it is in the way
    C usr.bin/extattr/getextattr.c

I have made no changes to my source tree.  If I remove the files that 
drew the complaints and re-run cvs update, I get the expected messages. 
 Mostly.

Earlier today, after removing the files, the output from cvs update 
started

   cvs [update aborted]: no such directory `lib/libssh'
   cvs update: warning: lib/libssh/Makefile was lost
   U lib/libssh/Makefile
   cvs update: warning: lib/libssh/shlib_version was lost
   U lib/libssh/shlib_version
   cvs update: warning: sys/arch/arm/ep93xx/ep93xx_busdma.c was lost
   U sys/arch/arm/ep93xx/ep93xx_busdma.c

Similarly, if I try to examine one of the currently complained-about 
files, I get

   % cvs diff sys/arch/evbarm/tsarm/isa/isa_machdep.c
   cvs [diff aborted]: no such directory `sys/arch/evbarm/tsarm/isa'

In both cases I get "aborted" messages complaining that 
apparently-valid directories are missing (presumably from the server).  
(This particular file is not one I care about; I'm working on an i386 
box.)  Note also, that despite the complaint, the update of 
lib/libssh/Makefile was successful.

Further, when I tried to build from the sources I'd updated (after 
removing the conflicting files and re-updating them), the build failed:

 #   compile  libpam/openpam_borrow_cred.ln
CC=/usr/src/arch/i386/tools/bin/i386--netbsdelf-gcc 
/usr/src/arch/i386/tools/bin/i386--netbsdelf-lint -chapbxzF -Sw -X 233 
-d /usr/src/arch/i386/build/usr/include  -DLIB_MAJ=0 
-DOPENPAM_STATIC_MODULES -DOPENPAM_STATIC_MODULE -DDEBUG    -i 
/usr/src/dist/openpam/lib/openpam_borrow_cred.c
/usr/src/dist/openpam/lib/openpam_impl.h(131): redeclaration of 
openpam_load_module [27]
/usr/src/dist/openpam/lib/openpam_impl.h(131): warning: old style 
declaration; add int [1]

*** Failed target:  openpam_borrow_cred.ln
*** Failed command: CC=/usr/src/arch/i386/tools/bin/i386--netbsdelf-gcc 
/usr/src/arch/i386/tools/bin/i386--netbsdelf-lint -chapbxzF -Sw -X 233 
-d /usr/src/arch/i386/build/usr/include -DLIB_MAJ=0 
-DOPENPAM_STATIC_MODULES -DOPENPAM_STATIC_MODULE -DDEBUG -i 
/usr/src/dist/openpam/lib/openpam_borrow_cred.c
*** Error code 1

After this failure, I tried another "cvs update" and got another set of 
conflicting file complaints.  It looks like the list of offending files 
did not change between the two updates.  The list is:

lib/libssh/Makefile
lib/libssh/shlib_version
sys/arch/arm/ep93xx/ep93xx_busdma.c
sys/arch/arm/ep93xx/ep93xx_intr.c
sys/arch/arm/ep93xx/ep93xx_intr.h
sys/arch/arm/ep93xx/ep93xx_space.c
sys/arch/arm/ep93xx/ep93xxreg.h
sys/arch/arm/ep93xx/ep93xxvar.h
sys/arch/arm/ep93xx/epclk.c
sys/arch/arm/ep93xx/epclkreg.h
sys/arch/arm/ep93xx/epcom.c
sys/arch/arm/ep93xx/epcomreg.h
sys/arch/arm/ep93xx/epcomvar.h
sys/arch/arm/ep93xx/epe.c
sys/arch/arm/ep93xx/epereg.h
sys/arch/arm/ep93xx/epevar.h
sys/arch/arm/ep93xx/epohci.c
sys/arch/arm/ep93xx/epsoc.c
sys/arch/arm/ep93xx/epsocvar.h
sys/arch/arm/ep93xx/files.ep93xx
sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000/Makefile
sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000/ldscript
sys/arch/evbarm/tsarm/epcom_ts.c
sys/arch/evbarm/tsarm/epcom_tsvar.h
sys/arch/evbarm/tsarm/isa/isa_io.c
sys/arch/evbarm/tsarm/isa/isa_io_asm.S
sys/arch/evbarm/tsarm/isa/isa_machdep.c
sys/arch/evbarm/tsarm/tsarm_machdep.c
sys/arch/evbarm/tsarm/tsarm_start.S
sys/arch/evbarm/tsarm/tsarmreg.h
sys/arch/evbarm/tsarm/tsarmvar.h
sys/arch/evbarm/tsarm/tslcd.c
sys/arch/evbarm/tsarm/tspld.c
sys/arch/evbarm/tsarm/tspldvar.h
sys/arch/evbarm/tsarm/tsrtc.c
sys/arch/evbarm/tsarm/wdc_ts.c
usr.bin/extattr/Makefile
usr.bin/extattr/getextattr.1
usr.bin/extattr/getextattr.c

Does any of this ring any bells for anyone?

Thanks.


	--Ed