cvs problems on 1998 Sep 7 current

["William Allen Simpson" <wsimpson_(_at_)_greendragon_(_dot_)_com>]

I ran cvs up -PAd for src for the first time in over a month on Monday
(holiday), and had a number of problems.

=== 1

A number of files are still hanging around here, but have been lost in
the cvs tree:

? kerberosIV/kadm/kadm_err.h
? kerberosIV/kadm/kadm_err.c
? kerberosIV/krb/krb_err.h
? kerberosIV/krb/krb_err.c
? usr.bin/audioctl/audioctl
? usr.bin/audioctl/audioctl.cat1
? usr.bin/mixerctl/mixerctl
? usr.bin/mixerctl/mixerctl.cat1
? gnu/usr.sbin/e2fsprogs/lib/et/diff3.core
? gnu/usr.sbin/e2fsprogs/lib/ss/diff3.core

=== 2

Some folks have moved around a fair number of files and directories, and
make obj failed.  I had to rm -rf /usr/obj and run make obj again.

=== 3

The update is failing in one section of the tree, although the make
build went OK (as far as I can tell).

[...]
cvs server: Updating gnu/usr.sbin/e2fsprogs/lib/et
cvs server: warning: gnu/usr.sbin/e2fsprogs/lib/et/ChangeLog is not (any longer) pertinent
cvs server: warning: gnu/usr.sbin/e2fsprogs/lib/et/Makefile.in is not (any longer) pertinent
RCS file: /cvs/src/gnu/usr.sbin/e2fsprogs/lib/et/Attic/com_err.3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
Merging differences between 1.1.1.1 and 1.2 into com_err.3
/usr/bin/diff3: Segmentation fault
rcsmerge aborted
cvs server: could not merge revision 1.1.1.1 of gnu/usr.sbin/e2fsprogs/lib/et/com_err.3
cvs server: restoring gnu/usr.sbin/e2fsprogs/lib/et/com_err.3 from backup file .#com_err.3.1.1.1.1
cvs server: warning: gnu/usr.sbin/e2fsprogs/lib/et/com_err.c is not (any longer) pertinent
cvs server: warning: gnu/usr.sbin/e2fsprogs/lib/et/com_err.h is not (any longer) pertinent
RCS file: /cvs/src/gnu/usr.sbin/e2fsprogs/lib/et/Attic/com_err.texinfo,v
retrieving revision 1.1.1.1
retrieving revision 1.2
Merging differences between 1.1.1.1 and 1.2 into com_err.texinfo
/usr/bin/diff3: Segmentation fault
rcsmerge aborted
cvs server: could not merge revision 1.1.1.1 of gnu/usr.sbin/e2fsprogs/lib/et/com_err.texinfo
cvs server: restoring gnu/usr.sbin/e2fsprogs/lib/et/com_err.texinfo from backup file .#com_err.texinfo.1.1.1.1
[...lots and lots more of the same...]

WSimpson_(_at_)_UMich_(_dot_)_edu
    Key fingerprint =  17 40 5E 67 15 6F 31 26  DD 0D B9 9B 6A 15 2C 32