Date: Sun, 29 Jul 2001 02:45:52 -0700 From: Kris Kennaway <kris@obsecurity.org> To: Greg Lehey <grog@FreeBSD.org> Cc: Darren Reed <darrenr@FreeBSD.org>, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/contrib/ipfilter/netinet fil.c ip_auth.c ip_auth.h ip_compat.h ip_fil.c ip_fil.h ip_frag.c ip_frag.h ip_ftp_pxy.c ip_log.c ip_nat.c ip_nat.h ip_proxy.c ip_proxy.h ip_raudio_pxy.c ip_state.c ip_state.h ipl.h Message-ID: <20010729024551.A77471@xor.obsecurity.org> In-Reply-To: <20010729100813.C68202@wantadilla.lemis.com>; from grog@FreeBSD.org on Sun, Jul 29, 2001 at 10:08:13AM %2B0930 References: <200107281158.f6SBwV351553@freefall.freebsd.org> <20010729100813.C68202@wantadilla.lemis.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--X1bOJ3K7DJ5YkBrT Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Jul 29, 2001 at 10:08:13AM +0930, Greg Lehey wrote: > On Saturday, 28 July 2001 at 4:58:31 -0700, Darren Reed wrote: > > darrenr 2001/07/28 04:58:30 PDT > > > > Modified files: > > sys/contrib/ipfilter/netinet fil.c ip_auth.c ip_auth.h > > ip_compat.h ip_fil.c ip_fil.h > > ip_frag.c ip_frag.h ip_ftp_pxy.c > > ip_log.c ip_nat.c ip_nat.h > > ip_proxy.c ip_proxy.h > > ip_raudio_pxy.c ip_state.c > > ip_state.h ipl.h > > Log: > > fix conflicts created by import >=20 > Could you describe these "conflicts"? I estimate about 1000 lines of > changes. Last time I looked at a commit like this, it consisted > mainly of bug fixes. It would be nice to know what has been fixed, > especially in a security-related product. That's not what we usually do for vendor imports: this commit is presumably the result of CVS's semi-automatic conflict resolution when you do an import, and the line diff count just shows up because the file is off the vendor branch. It's no different than the diffs which don't conflict and which also change thousands of lines of code: those are just hidden internally by CVS. The changes in the code are presumably described within the changelog file includes in the CVS repository. We don't traditionally summarize the changes (except in some cases for major new features or bugfixes) when doing any vendor import, the reason being the information is available within the repository in the changelog file which is imported. Kris --X1bOJ3K7DJ5YkBrT 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 iD8DBQE7Y9tPWry0BWjoQKURApOTAKDj1JtwHGPoWDNMsrYRdJsTDmNe5wCgnhfs I09/7K+mrGt3zf9HuxEawf8= =TdQe -----END PGP SIGNATURE----- --X1bOJ3K7DJ5YkBrT-- 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?20010729024551.A77471>