Date: Tue, 29 Jan 2002 12:02:54 +1030 From: Greg Lehey <grog@FreeBSD.org> To: Josef Karthauser <joe@tao.org.uk> Cc: David O'Brien <obrien@FreeBSD.org>, Kris Kennaway <kris@obsecurity.org>, Kris Kennaway <kris@FreeBSD.org>, 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: <20020129120254.I92998@wantadilla.lemis.com> In-Reply-To: <20020128185952.B98860@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>
next in thread | previous in thread | raw e-mail | index | archive | help
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 log >> 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. I suppose with a vendor branch import it's not such an issue. But it could be as simple as "resolve conflicts from import". Greg -- See complete headers for address and phone numbers To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020129120254.I92998>