From owner-cvs-all Sun Jan 27 16:18:15 2002 Delivered-To: cvs-all@freebsd.org Received: from wantadilla.lemis.com (wantadilla.lemis.com [192.109.197.80]) by hub.freebsd.org (Postfix) with ESMTP id 9520337B416; Sun, 27 Jan 2002 16:18:09 -0800 (PST) Received: by wantadilla.lemis.com (Postfix, from userid 1004) id E2AC1782D0; Mon, 28 Jan 2002 10:48:07 +1030 (CST) Date: Mon, 28 Jan 2002 10:48:07 +1030 From: Greg Lehey To: Kris Kennaway Cc: 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: <20020128104807.O72512@wantadilla.lemis.com> References: <200201270317.g0R3HDh14980@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200201270317.g0R3HDh14980@freefall.freebsd.org> User-Agent: Mutt/1.3.23i Organization: The FreeBSD Project Phone: +61-8-8388-8286 Fax: +61-8-8388-8725 Mobile: +61-418-838-708 WWW-Home-Page: http://www.FreeBSD.org/ X-PGP-Fingerprint: 6B 7B C3 8C 61 CD 54 AF 13 24 52 F8 6D A4 95 EF 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 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? 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