From owner-cvs-all Sun Jan 10 06:04:49 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id GAA23577 for cvs-all-outgoing; Sun, 10 Jan 1999 06:04:49 -0800 (PST) (envelope-from owner-cvs-all@FreeBSD.ORG) Received: from spinner.netplex.com.au (spinner.netplex.com.au [202.12.86.3]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id GAA23571; Sun, 10 Jan 1999 06:04:45 -0800 (PST) (envelope-from peter@netplex.com.au) Received: from spinner.netplex.com.au (peter@localhost [127.0.0.1]) by spinner.netplex.com.au (8.9.1/8.9.1/Netplex) with ESMTP id WAA54321; Sun, 10 Jan 1999 22:03:56 +0800 (WST) (envelope-from peter@spinner.netplex.com.au) Message-Id: <199901101403.WAA54321@spinner.netplex.com.au> X-Mailer: exmh version 2.0.2 2/24/98 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 In-reply-to: Your message of "Sun, 10 Jan 1999 08:34:57 EST." <199901101334.IAA10429@khavrinen.lcs.mit.edu> Date: Sun, 10 Jan 1999 22:03:55 +0800 From: Peter Wemm Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk Garrett Wollman wrote: > < 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