cvs commit: src/contrib/openpam/include/security openpam_attr.h

[Dag-Erling Smørgrav]

Dag-Erling Smørgrav <des at des.no> writes:
> Rong-En Fan <rafan at FreeBSD.org> writes:
> >   Added files:           (Branch: RELENG_7)
> >     contrib/openpam/include/security openpam_attr.h
> >   Log:
> >   - Add missing file for OpenPAM Hydrangea MFC
> Bugger.  Of course, 'make world' worked fine before I committed, and I
> didn't notice that the new file wasn't included in the commit.  Thank
> you for taking care of it.

OK, this is very weird.

I did a cvs up on the tree I committed from, and discovered that not
only had openpam_attr.h been correctly 'cvs add'ed, but several other
removed or added files were not committed:

R contrib/openpam/MANIFEST
A contrib/openpam/compile
R contrib/openpam/configure.in
R contrib/openpam/ltconfig
R contrib/openpam/mkinstalldirs
R contrib/openpam/stamp-h.in
cvs update: conflict: contrib/openpam/include/security/openpam_attr.h created independently by second party
C contrib/openpam/include/security/openpam_attr.h

Fortunately, none of these (except opempam_attr.h) were important.

There is something rotten in the state of CVS.

I believe the command I used to commit was

% fncvs commit -m contrib/openpam/commit-message contrib/openpam lib/libpam usr.sbin/ppp

(where fncvs is an alias for 'cvs -z3 -d ncvs.freebsd.org:/home/ncvs')

Apparently, it only committed modified files, not added or removed
files.

DES
-- 
Dag-Erling Smørgrav - des at des.no