Date: Tue, 26 Apr 2005 14:32:10 +1000 (EST) From: Bruce Evans <bde@zeta.org.au> To: Darren Reed <darrenr@hub.freebsd.org> Cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/contrib/ipfilter INST.FreeBSD-2.2 Makefilefils.c inet_addr.c ip_fil_freebsd.c ip_htable.c ip_htable.h ip_irc_pxy.c ip_lfil.c ip_lookup.c ip_lookup.h ... Message-ID: <20050426141230.L1713@epsplex.bde.org> In-Reply-To: <20050426032556.GB14477@hub.freebsd.org> References: <200504251820.j3PIKGY1021086@repoman.freebsd.org> <20050426032556.GB14477@hub.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 26 Apr 2005, Darren Reed wrote: > On Tue, Apr 26, 2005 at 12:31:35PM +1000, Bruce Evans wrote: >>> Revision Changes Path >>> 1.2 +0 -707 src/contrib/ipfilter/FWTK/fwtk-2.1-transparency.txt >>> (dead) >>> 1.2 +0 -82 src/contrib/ipfilter/FWTK/tproxy.diff (dead) >>> 1.2 +0 -24 src/contrib/ipfilter/FreeBSD-4.0/INST.FreeBSD-4 >>> (dead) >>> 1.2 +2 -0 src/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0 >>> 1.2 +2 -0 src/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1 >>> 1.2 +1 -1 src/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2 >>> ... >> >> This seems to make matters much worse by taking vendor files of the vendor >> branch. > > Hmmm? > > They shouldn't be present in future imports, either. Most of them haven't been removed. Changes like +1 -1 indicate non-removal. I trimmed most of the context that has such changes. In the above, the change between 1.1 and 1.2 for FreeBSD-4.0/ipv6-patch-4.2 is from an unexpanded $NetBSD$ tag to an expanded $FreeBSD$ tag. Files in the contrib directory are supposed to have $FreeBSD$ tags if and only if FreeBSD actually changed them, and there shouldn't be many such files. In my year-old copy of the contrib directory, about 4% of the files have a $FreeBSD$ tag, and contrib/ipfilter has the same percentage of such files. Bruce
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050426141230.L1713>