From owner-cvs-src@FreeBSD.ORG  Mon Jan 21 15:07:56 2008
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 71E4316A41A;
	Mon, 21 Jan 2008 15:07:56 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from elvis.mu.org (elvis.mu.org [192.203.228.196])
	by mx1.freebsd.org (Postfix) with ESMTP id 5A4AC13C45B;
	Mon, 21 Jan 2008 15:07:56 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from zion.baldwin.cx (66-23-211-162.clients.speedfactory.net
	[66.23.211.162]) by elvis.mu.org (Postfix) with ESMTP id 0B0C81A4D83;
	Mon, 21 Jan 2008 07:04:12 -0800 (PST)
From: John Baldwin <jhb@freebsd.org>
To: Dag-Erling =?utf-8?q?Sm=C3=B8rgrav?= <des@des.no>
Date: Mon, 21 Jan 2008 09:35:45 -0500
User-Agent: KMail/1.9.7
References: <200801191147.m0JBlbeI019947@repoman.freebsd.org>
	<86prvvxs8w.fsf@ds4.des.no> <86lk6jxroq.fsf@ds4.des.no>
In-Reply-To: <86lk6jxroq.fsf@ds4.des.no>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
Message-Id: <200801210935.45997.jhb@freebsd.org>
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
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Jan 2008 15:07:56 -0000

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