Date: Sun, 10 Jan 1999 22:03:55 +0800 From: Peter Wemm <peter@netplex.com.au> To: cvs-committers@FreeBSD.ORG Cc: cvs-all@FreeBSD.ORG Subject: Re: cvs commit: src/lib/libz FAQ inffixed.h ChangeLog README adler32.c compress.c crc32.c deflate.c deflate.h example.c gzio.c infblock.c infcodes.c inffast.c inftrees.c inftrees.h minigzip.c trees.c uncompr.c zconf.h zlib.3 zlib.h zutil.c zutil.h Message-ID: <199901101403.WAA54321@spinner.netplex.com.au> In-Reply-To: Your message of "Sun, 10 Jan 1999 08:34:57 EST." <199901101334.IAA10429@khavrinen.lcs.mit.edu>
next in thread | previous in thread | raw e-mail | index | archive | help
Garrett Wollman wrote:
> <<On Sat, 9 Jan 1999 20:55:15 -0800 (PST), Brian Somers <brian@FreeBSD.ORG> s
aid:
>
> > 1.2 +232 -0 src/lib/libz/ChangeLog
> > 1.2 +87 -38 src/lib/libz/README
>
> You've now stuffed up the vendor branch...
>
> -GAWollman
This has been ``fixed''. (Well, the sledgehammer approach anyway).
To be fair to Brian, I did tell him to hold off as he wanted to do this
just before 3.0-RELEASE, and that we'd come back to it once the dust had
settled. I wish he'd given a little more warning before jumping in though
and this might have been able to be caught before it was too late.
I repeat the general call to committers: When dealing with a 3rd party
software update, there *generally are* special CVS requirements for doing
it. If you have any doubt about how to do a vendor branch update and
merge, or how to find out if you need to do this, then *please ask first*!
There are at least a handful of people on the committers list who know how
to do this. If it's something unusual (especially if it's file renaming or
moving), ask either John Polstra or me (use the cvs@freebsd.org alias to
get us both and anybody else who might be listening in.)
Cheers,
-Peter
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?199901101403.WAA54321>