From owner-cvs-all Tue Jan 29 7: 0:15 2002 Delivered-To: cvs-all@freebsd.org Received: from tao.org.uk (genius.tao.org.uk [212.135.162.51]) by hub.freebsd.org (Postfix) with ESMTP id E7B9837B400; Tue, 29 Jan 2002 07:00:05 -0800 (PST) Received: by tao.org.uk (Postfix, from userid 100) id AD6AA32B; Tue, 29 Jan 2002 15:00:03 +0000 (GMT) Date: Tue, 29 Jan 2002 15:00:03 +0000 From: Josef Karthauser To: Greg Lehey Cc: Josef Karthauser , David O'Brien , 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: <20020129150003.E16509@genius.tao.org.uk> References: <200201270317.g0R3HDh14980@freefall.freebsd.org> <20020128104807.O72512@wantadilla.lemis.com> <20020127173357.A33513@xor.obsecurity.org> <20020128131535.L18585@wantadilla.lemis.com> <20020128102906.B69546@dragon.nuxi.com> <20020128185952.B98860@genius.tao.org.uk> <20020129120254.I92998@wantadilla.lemis.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-md5; protocol="application/pgp-signature"; boundary="zaRBsRFn0XYhEU69" Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <20020129120254.I92998@wantadilla.lemis.com>; from grog@FreeBSD.org on Tue, Jan 29, 2002 at 12:02:54PM +1030 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 --zaRBsRFn0XYhEU69 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jan 29, 2002 at 12:02:54PM +1030, Greg Lehey wrote: > On Monday, 28 January 2002 at 18:59:52 +0000, Josef Karthauser wrote: > > On Mon, Jan 28, 2002 at 10:29:06AM -0800, David O'Brien wrote: > >> 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 l= og > >> message. > > > > What do you want to tell from these logs. I'm willing to write the > > reports, but you tell me what they should say. >=20 > I suppose with a vendor branch import it's not such an issue. But it > could be as simple as "resolve conflicts from import". Or, it could look just like any other commit message. Joe=20 --zaRBsRFn0XYhEU69 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (FreeBSD) Comment: For info see http://www.gnupg.org iEYEARECAAYFAjxWuPMACgkQXVIcjOaxUBZeLgCgstBJST2akvucvp9uEK6HQC3M UToAnR5ZhX2zU3KK91qBmRB66/ufOQF2 =1XQW -----END PGP SIGNATURE----- --zaRBsRFn0XYhEU69-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message