Date: Mon, 21 Jan 2008 13:56:53 +0100 From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no> To: Rong-En Fan <rafan@FreeBSD.org> Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/contrib/openpam/include/security openpam_attr.h Message-ID: <86lk6jxroq.fsf@ds4.des.no> In-Reply-To: <86prvvxs8w.fsf@ds4.des.no> ("Dag-Erling =?utf-8?Q?Sm=C3=B8rg?= =?utf-8?Q?rav=22's?= message of "Mon\, 21 Jan 2008 13\:44\:47 %2B0100") References: <200801191147.m0JBlbeI019947@repoman.freebsd.org> <86prvvxs8w.fsf@ds4.des.no>
next in thread | previous in thread | raw e-mail | index | archive | help
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. 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 creat= ed 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 --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86lk6jxroq.fsf>