Date: Fri, 14 Jan 2000 04:13:05 +0800 From: Peter Wemm <peter@netplex.com.au> To: Guido van Rooij <guido@FreeBSD.org> 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 ... Message-ID: <20000113201305.1E6041CD5@overcee.netplex.com.au> In-Reply-To: Message from Guido van Rooij <guido@FreeBSD.org> of "Thu, 13 Jan 2000 21:07:53 %2B0100." <20000113210753.B95202@gvr.gvr.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000113201305.1E6041CD5>