Date: Tue, 20 Aug 1996 15:24:32 -0600 From: Warner Losh <imp@village.org> To: Peter Wemm <peter@spinner.DIALix.COM> Cc: Paul Traina <pst@freefall.freebsd.org>, CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-user@freefall.freebsd.org Subject: Re: cvs commit: src/contrib/libpcap FREEBSD-upgrade Message-ID: <199608202124.PAA01081@rover.village.org> In-Reply-To: Your message of Tue, 20 Aug 1996 06:59:40 %2B0800
next in thread | raw e-mail | index | archive | help
: First, the -ko expand option was added to preserve the $Header$ lines in : the code.. The whole point of contrib is to have minimal diffs relative : to the "real thing" so that anybody can come in off the street and diff : the sources against the real release. Specifying -ko on import for : src/contrib wasn't something we mentioned in the contrib guidelines, but : we probably should. In CVS -ko is useless in 1.6.3, but works great in 1.8.1 for keeping vendor branches up to date on imports. Otherplaces it works great. That is cvs import -ko works in 1.8.1, but will leave the $xx$ stuff expanded in 1.6.3. I found this out the hard way keeping Linux in a vendor branch. It is *CRITICAL* that you do this. Also, be on the lookout for the $Log$ directive, since it is *EVIL* and tends to screw you up when trying to keep a series of diffs in a CVS tree. Another reason -ko is so critical. Also, you may not notice the problems with -ko on the first import, but subsequent ones have bitten me (since I didn't do a fresh checkout after the import, since I had assumed that -ko would do the right thing, which it fails to do in 1.6.3). Warner P.S. The actual sequence is tar xvf something.tar cvs import -ko # keywords expanded in the working dirs patch < some-patch cvs import -ko # Bang, you're dead, you have # corrupted the $xx$ keywords This has been fixed in 1.8.1.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199608202124.PAA01081>