Date: Tue, 20 Aug 1996 06:59:40 +0800 From: Peter Wemm <peter@spinner.DIALix.COM> To: Paul Traina <pst@freefall.freebsd.org> Cc: 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: <199608192259.GAA18130@spinner.DIALix.COM> In-Reply-To: Your message of "Mon, 19 Aug 1996 15:27:27 MST." <199608192227.PAA23433@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Paul Traina wrote:
> pst 96/08/19 15:27:26
>
> Modified: contrib/libpcap FREEBSD-upgrade
> Log:
> Add ignore of SUNOS4 subdirectory to commit instructions
As a followup on this, some repository bashing was done behind the scenes
shortly after it was imported...
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.
Second, I manually selectively edited out the rcs deltas that were bogusly
changing the $Header$ with the commits that Paul did to bring in our local
changes. This is hairy stuff...
Third, the SunOS4 binaries were deleted from the repository..
Fourth, CVSup is going to have a *fit* when it sees what I've done. If
you are lucky, it will report a md5 checksum mismatch and retransmit the
files that i've edited. If not, you may have to manually delete the old
rcs files and let cvsup bring down new ones. Sup/ctm people dont have to
worry about this as only cvsup knows about rcs file internals.
Fifth, I'm looking for a good hiding place, John Polstra is going to try
and kill me shortly after reading this email and/or after he runs cvsup
himself... :-]
Sixth, If you managed to get a checked out copy of these files over the
last half hour or so, you may have got a stale set. It's no big deal,
only the $Header$ lines may be wrong, and CVS *wont* tell you. You might
like to delete all the checked out copies of the files (and I mean _all_
of them under src/contrib/{tcpdump|libpcap}) and let cvs check out a new
fresh copy.
The list of affected rcs files are:
18 -r--r--r-- 1 peter ncvs 17665 Aug 19 15:20 addrtoname.c,v
4 -r--r--r-- 1 peter ncvs 3280 Aug 19 15:20 ethertype.h,v
15 -r--r--r-- 1 peter ncvs 15045 Aug 19 15:20 print-atalk.c,v
6 -r--r--r-- 1 peter ncvs 5974 Aug 19 15:20 print-ether.c,v
15 -r--r--r-- 1 peter ncvs 15158 Aug 19 15:20 print-ip.c,v
7 -r--r--r-- 1 peter ncvs 6370 Aug 19 15:20 print-ipx.c,v
14 -r--r--r-- 1 peter ncvs 13578 Aug 19 15:20 print-isoclns.c,v
6 -r--r--r-- 1 peter ncvs 5471 Aug 19 15:20 print-ppp.c,v
This is not Paul's fault, nobody told him about it. We need to update the
instructions to mention the issues here. It might be nice if easy-import
could scan files destined for src/contrib for $Id$ and/or $Header$ etc and
offer to turn on -ko of they are present.
Cheers,
-Peter
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199608192259.GAA18130>