From owner-cvs-all@FreeBSD.ORG Mon Jan 21 12:57:01 2008 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8A8F916A419; Mon, 21 Jan 2008 12:57:01 +0000 (UTC) (envelope-from des@des.no) Received: from tim.des.no (tim.des.no [194.63.250.121]) by mx1.freebsd.org (Postfix) with ESMTP id 4643F13C4EE; Mon, 21 Jan 2008 12:57:01 +0000 (UTC) (envelope-from des@des.no) Received: from tim.des.no (localhost [127.0.0.1]) by spam.des.no (Postfix) with ESMTP id 7EB9C208A; Mon, 21 Jan 2008 13:56:53 +0100 (CET) X-Spam-Tests: AWL X-Spam-Learn: disabled X-Spam-Score: -0.2/3.0 X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on tim.des.no Received: from ds4.des.no (des.no [80.203.243.180]) by smtp.des.no (Postfix) with ESMTP id 6C6CC2088; Mon, 21 Jan 2008 13:56:53 +0100 (CET) Received: by ds4.des.no (Postfix, from userid 1001) id 580E68449D; Mon, 21 Jan 2008 13:56:53 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Rong-En Fan References: <200801191147.m0JBlbeI019947@repoman.freebsd.org> <86prvvxs8w.fsf@ds4.des.no> Date: Mon, 21 Jan 2008 13:56:53 +0100 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 +0100") Message-ID: <86lk6jxroq.fsf@ds4.des.no> User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/22.1 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jan 2008 12:57:01 -0000 Dag-Erling Sm=C3=B8rgrav writes: > Rong-En Fan 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