From owner-cvs-all Thu Jan 13 12:13:13 2000 Delivered-To: cvs-all@freebsd.org Received: from overcee.netplex.com.au (overcee.netplex.com.au [202.12.86.7]) by hub.freebsd.org (Postfix) with ESMTP id 227FE155E4; Thu, 13 Jan 2000 12:13:07 -0800 (PST) (envelope-from peter@netplex.com.au) Received: from netplex.com.au (localhost [127.0.0.1]) by overcee.netplex.com.au (Postfix) with ESMTP id 1E6041CD5; Fri, 14 Jan 2000 04:13:05 +0800 (WST) (envelope-from peter@netplex.com.au) X-Mailer: exmh version 2.1.1 10/15/1999 To: Guido van Rooij Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/contrib/ipfilter HISTORY fil.c fils.c ip_compat.h ip_fil.c ip_fil.h ip_frag.c ip_ftp_pxy.c ip_nat.c ip_nat.h ip_sfil.c ip_state.c ipl.h ipmon.c ipnat.c parse.c solaris.c todo src/contrib/ipfilter/iplang iplang_y.y src/contrib/ipfilter/ipsend ... In-Reply-To: Message from Guido van Rooij of "Thu, 13 Jan 2000 21:07:53 +0100." <20000113210753.B95202@gvr.gvr.org> Date: Fri, 14 Jan 2000 04:13:05 +0800 From: Peter Wemm Message-Id: <20000113201305.1E6041CD5@overcee.netplex.com.au> Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk Guido van Rooij wrote: > On Fri, Jan 14, 2000 at 03:44:31AM +0800, Peter Wemm wrote: > > > > I've figured out how to do this, but it's still going to require merges on > > a handful of files. > > > > I'd back out the blasted "spelling fixes" and put the man pages back > > onto the vendor branch, but they ended up on a release. :-( > > Hmm.I thought it was even in the cvs FAQ ;-() > > Doesn't the following do the trick: > cvs admin -bVENDOR file.c No, you've got to clean up the other revisions first. As I said, I can do this, and the only non vendor branched files will be: NAT.FreeBSD 1.2 ipmon.c 1.4 man/ipsend.5 1.2 man/ipsend.c 1.3 man/iptest.1 1.3 man/sbpf.c 1.2 man/sock.c 1.2 man/ipf.4 1.3 man/ipf.5 1.3 man/ipf.8 1.2 man/ipfilter.5 1.2 man/ipfstat.8 1.2 man/ipftest.1 1.3 man/ipmon.8 1.5 man/ipnat.4 1.3 Those files will need the last few imports merged into them again. If I revert all this stuff, can you fix it up please? > -Guido > > Cheers, -Peter -- Peter Wemm - peter@FreeBSD.org; peter@yahoo-inc.com; peter@netplex.com.au "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message