Date: Mon, 21 Jan 2008 09:35:45 -0500 From: John Baldwin <jhb@freebsd.org> To: Dag-Erling =?utf-8?q?Sm=C3=B8rgrav?= <des@des.no> Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org, Rong-En Fan <rafan@freebsd.org> Subject: Re: cvs commit: src/contrib/openpam/include/security openpam_attr.h Message-ID: <200801210935.45997.jhb@freebsd.org> In-Reply-To: <86lk6jxroq.fsf@ds4.des.no> References: <200801191147.m0JBlbeI019947@repoman.freebsd.org> <86prvvxs8w.fsf@ds4.des.no> <86lk6jxroq.fsf@ds4.des.no>
next in thread | previous in thread | raw e-mail | index | archive | help
On Monday 21 January 2008 07:56:53 am Dag-Erling Sm=C3=B8rgrav wrote: > Dag-Erling Sm=C3=B8rgrav <des@des.no> writes: > > Rong-En Fan <rafan@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. >=20 > OK, this is very weird. >=20 > 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: >=20 > 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 cre= ated independently by second party > C contrib/openpam/include/security/openpam_attr.h >=20 > Fortunately, none of these (except opempam_attr.h) were important. >=20 > There is something rotten in the state of CVS. >=20 > I believe the command I used to commit was >=20 > % fncvs commit -m contrib/openpam/commit-message contrib/openpam lib/libp= am usr.sbin/ppp >=20 > (where fncvs is an alias for 'cvs -z3 -d ncvs.freebsd.org:/home/ncvs') >=20 > Apparently, it only committed modified files, not added or removed > files. Are you running HEAD with the recent CVS import? It appears to have introduced at least one other bug as well (a duplicate free() bug was reported on the lists as a regression). =2D-=20 John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801210935.45997.jhb>