Date: Mon, 28 Jan 2002 20:30:56 +1030 From: Greg Lehey <grog@FreeBSD.org> To: Peter Wemm <peter@wemm.org> Cc: 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: <20020128203056.E83297@wantadilla.lemis.com> In-Reply-To: <20020128082908.310643BAC@overcee.wemm.org> References: <20020128131535.L18585@wantadilla.lemis.com> <20020128082908.310643BAC@overcee.wemm.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Monday, 28 January 2002 at 0:29:08 -0800, Peter Wemm wrote: > Greg Lehey wrote: >> On Sunday, 27 January 2002 at 17:33:57 -0800, Kris Kennaway wrote: >>> On Mon, Jan 28, 2002 at 10:48:07AM +1030, Greg Lehey wrote: >>>> On Saturday, 26 January 2002 at 19:17:13 -0800, Kris Kennaway wrote: >>>>> kris 2002/01/26 19:17:13 PST >>>>> >>>>> Modified files: >>>>> crypto/openssl/crypto/evp evp.h >>>>> crypto/openssl/crypto/rsa rsa.h rsa_eay.c >>>>> crypto/openssl/ssl s23_clnt.c s23_srvr.c s2_clnt.c s2_enc.c >>>>> s2_pkt.c s2_srvr.c >>>>> Log: >>>>> Resolve conflicts. >>>>> >>>>> Revision Changes Path >>>>> 1.9 +2 -4 src/crypto/openssl/crypto/evp/evp.h >>>>> 1.7 +3 -4 src/crypto/openssl/crypto/rsa/rsa.h >>>>> 1.7 +32 -3 src/crypto/openssl/crypto/rsa/rsa_eay.c >>>>> 1.6 +2 -2 src/crypto/openssl/ssl/s23_clnt.c >>>>> 1.6 +81 -12 src/crypto/openssl/ssl/s23_srvr.c >>>>> 1.7 +89 -22 src/crypto/openssl/ssl/s2_clnt.c >>>>> 1.6 +3 -3 src/crypto/openssl/ssl/s2_enc.c >>>>> 1.7 +38 -21 src/crypto/openssl/ssl/s2_pkt.c >>>>> 1.7 +120 -22 src/crypto/openssl/ssl/s2_srvr.c >>>> >>>> That's a lot of conflicts. Some of them appear to be added copyright >>>> notices and some code changes which aren't immediately apparent, but >>>> don't look much like conflicts to me. Can't we have a more >>>> descriptive log message? >>> >>> 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. > > Well, a better commit message may be "merge vendor changes onto mainline", > which is exactly accurate. Or even "merge vendor changes between > foo-release and bar-release onto mainline". There's not really anything > more to be said. When you do an import, some files immediately have the > changes visible, and some require a manual merge like this. It sucks that > imports are not atomic or coherent, but that's the way cvs is. That's pretty much (in more words) what I said to Kris in private Email. 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?20020128203056.E83297>