Date: Wed, 31 Mar 2004 10:44:07 +0100 From: Bruce M Simpson <bms@spc.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: CVS MEISTERS: PLEASE READ [was Re: cvs commit: src/contrib/tcpdump - Imported sources] Message-ID: <20040331094407.GA12038@empiric.dek.spc.org> In-Reply-To: <200403310917.i2V9HT0b014839@repoman.freebsd.org> References: <200403310917.i2V9HT0b014839@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--G4iJoqBmSsgzjUCe Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable WARNING: INCOMPLETE MERGE src/contrib/tcpdump is now under cvs_acls.pl protection. I have tested changes in a local repo ready to go, and I've left joe@ a voicemail asking if the restriction can be lifted. Unfortunately, whilst I have been able to perform the vendor branch import, I cannot resolve the conflicts until the restriction is lifted, at least in my case. (This is surely a bug in cvs_acls.pl -- I wasn't aware of the avail file until I stepped through why the commit to finish the tcpdump merge was failing). This will most likely mean tinderbox builds are broken until I can finish the merge. libpcap merge however appears to have gone successfully. BMS On Wed, Mar 31, 2004 at 01:17:29AM -0800, Bruce M Simpson wrote: > bms 2004/03/31 01:17:29 PST >=20 > FreeBSD src repository >=20 > src/contrib/tcpdump - Imported sources > Update of /home/ncvs/src/contrib/tcpdump > In directory repoman.freebsd.org:/tmp/cvs-serv14802 > =20 > Log Message: > Import tcpdump 3.8.3, from http://www.tcpdump.org/releases/tcpdump-3.8.= 3.tar.gz --G4iJoqBmSsgzjUCe Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Comment: '' iD8DBQFAapLmueUpAYYNtTsRAroDAJ9lWi7znu7+8HCidJYikuUpiNuoFACgotNj 47wSGJC4eSX8oelMJW0bCbM= =ImBV -----END PGP SIGNATURE----- --G4iJoqBmSsgzjUCe--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040331094407.GA12038>