From owner-cvs-all Tue Jul 24 23:26:35 2001 Delivered-To: cvs-all@freebsd.org Received: from dragon.nuxi.com (trang.nuxi.com [206.40.252.115]) by hub.freebsd.org (Postfix) with ESMTP id 128E237B405; Tue, 24 Jul 2001 23:26:28 -0700 (PDT) (envelope-from obrien@NUXI.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.11.3/8.11.1) id f6P6PtC09274; Tue, 24 Jul 2001 23:25:55 -0700 (PDT) (envelope-from obrien) Date: Tue, 24 Jul 2001 23:25:55 -0700 From: "David O'Brien" To: Bill Fumerola Cc: Sheldon Hearn , Bruce Evans , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/usr.bin/xlint/lint1 cgram.y decl.c emit.c emit1.c externs.h func.c init.c mem.c mem1.c scan.l tree.c src/usr.bin/xlint/lint2 chk.c hash.c main2.c msg.c read.c src/usr.bin/xlint/xlint xlint.c Message-ID: <20010724232555.C8313@dragon.nuxi.com> Reply-To: obrien@FreeBSD.org References: <20010724073537.C62582@dragon.nuxi.com> <92870.995995064@axl.seasidesoftware.co.za> <20010724184220.D2759@elvis.mu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <20010724184220.D2759@elvis.mu.org>; from billf@mu.org on Tue, Jul 24, 2001 at 06:42:20PM -0500 X-Operating-System: FreeBSD 5.0-CURRENT Organization: The NUXI BSD group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Tue, Jul 24, 2001 at 06:42:20PM -0500, Bill Fumerola wrote: > > 1) People get told that contrib/ is full of vendor branch stuff, be > > careful. > > > > 2) People are left to assume (not too unreasonably) that stuff that > > isn't in contrib/ isn't on a vendor branch. > > it takes approx 30 more seconds for me to 'cvs log foo.c | less' before > I type 'cvs ci foo.c'. to my knowledge, this method has worked for me > ever since I learned about the evils of moving files off vendor branches. Or even more importantly, the `cvs diff' one should do to make sure what they are about to commit is what they intend to commit. For example: Index: xcoffout.h =================================================================== RCS file: /home/ncvs/src/contrib/gcc.295/xcoffout.h,v retrieving revision 1.1.1.3 diff -u -r1.1.1.3 xcoffout.h --- xcoffout.h 1999/10/16 06:06:02 1.1.1.3 +++ xcoffout.h 2001/07/25 06:23:39 The "1.1.1.3" above should be a *major* clue that you are about to take something off the vendor branch. (1.1.1.x is a revison on a vendor branch) -- -- David (obrien@FreeBSD.org) P.S. and yes I *do* typically run ``cvs diff | cdiff'' before pulling the commit trigger. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message