From owner-cvs-all Mon Jan 28 10:29:13 2002 Delivered-To: cvs-all@freebsd.org Received: from dragon.nuxi.com (trang.nuxi.com [66.92.13.169]) by hub.freebsd.org (Postfix) with ESMTP id A5C5037B402; Mon, 28 Jan 2002 10:29:07 -0800 (PST) Received: (from obrien@localhost) by dragon.nuxi.com (8.11.6/8.11.1) id g0SIT6V69654; Mon, 28 Jan 2002 10:29:06 -0800 (PST) (envelope-from obrien) Date: Mon, 28 Jan 2002 10:29:06 -0800 From: "David O'Brien" To: Greg Lehey Cc: Kris Kennaway , Kris Kennaway , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/crypto/openssl/crypto/evp evp.h src/crypto/openssl/crypto/rsa rsa.h rsa_eay.c src/crypto/openssl/ssl s23_clnt.c s23_srvr.c s2_clnt.c s2_enc.c s2_pkt.c s2_srvr.c Message-ID: <20020128102906.B69546@dragon.nuxi.com> Reply-To: obrien@FreeBSD.org References: <200201270317.g0R3HDh14980@freefall.freebsd.org> <20020128104807.O72512@wantadilla.lemis.com> <20020127173357.A33513@xor.obsecurity.org> <20020128131535.L18585@wantadilla.lemis.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <20020128131535.L18585@wantadilla.lemis.com>; from grog@FreeBSD.org on Mon, Jan 28, 2002 at 01:15:35PM +1030 X-Operating-System: FreeBSD 5.0-CURRENT Organization: The NUXI BSD group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Mon, Jan 28, 2002 at 01:15:35PM +1030, Greg Lehey wrote: > >>> Resolve conflicts. ... > > You seem to ask for this a lot; I don't think you understand the cvs > > import process. > > Maybe I don't. Was there something here which I should have noticed > which shows that these were import conflicts? Most of the messages of > this nature don't seem to be, which is why I pick on them. You cannot tell from the CVS logs mailed out. These are the same as "CVS is so fscking *stupid*" and "we use the stock file" commit logs in src/contrib. Neither of which really tells you any more than Kris's log message. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message