From owner-cvs-all Sat Mar 30 1:25:44 2002 Delivered-To: cvs-all@freebsd.org Received: from dragon.nuxi.com (trang.nuxi.com [66.92.13.169]) by hub.freebsd.org (Postfix) with ESMTP id C190937B404; Sat, 30 Mar 2002 01:25:38 -0800 (PST) Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1]) by dragon.nuxi.com (8.12.2/8.12.2) with ESMTP id g2U9PbYm035074; Sat, 30 Mar 2002 01:25:37 -0800 (PST) (envelope-from obrien@dragon.nuxi.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.12.2/8.12.2/Submit) id g2U9OMCC017088; Sat, 30 Mar 2002 01:24:22 -0800 (PST) Date: Sat, 30 Mar 2002 01:24:22 -0800 From: "David O'Brien" To: Mark Murray Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/usr.bin/sort append.c extern.h fields.c files.c fsort.c init.c msort.c sort.1 sort.c tmp.c Message-ID: <20020330012421.A74485@dragon.nuxi.com> Reply-To: obrien@FreeBSD.org References: <20020329234623.A67334@dragon.nuxi.com> <200203300819.g2U8JSPL020154@grimreaper.grondar.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200203300819.g2U8JSPL020154@grimreaper.grondar.org>; from mark@grondar.za on Sat, Mar 30, 2002 at 08:19:27AM +0000 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 Sat, Mar 30, 2002 at 08:19:27AM +0000, Mark Murray wrote: > > > Make this compile on FreeBSD. Sort out VCS tags, fix warnings. > > Why did you rush to take these off the vendor branch?? > You make this sound as though I did it maliciously. :-( It seems gratuitous. > > Will there be future imports from NetBSD? > > Who knows? We could well get future updates from them; wheter that happens > by importing or simple diffing is not really important. Sort is small. You seem to now follow what an SCM is used for. If we have future updates from NetBSD they need to be vendor imports, not "simple diffs" committed. Otherwise the vendor branch is a waste and needless overhead. It also makes it much harder to see what we've changed relative to them. It also makes their $NetBSD$ IDs B.S. if they aren't updated to the version of the files the "simple patches" come from. > > If so the importer will much > > appreciate files remaining on the vendor branch for as long as possible. > > I put this in src/usr.bin because it was too small for contrib-type > treatment, and I want to treat it in a "grey area" way as far as updates > are concerned. That is fine, I am sure we will diverge the code some. > Lite/2 is a vendor branch, and that does not stop us fixing things there. Again, I am not against fixing. > The black/white rules for the vendor branch apply to contrib; I wanted to > do some fixes. Fixes are fine. 1/3 of this commit did not contain fixes -- append.c, msort.c, tmp.c. You also dicked around with the vendor __COPYRIGHT, which we don't do. Please restore it. > > If not, then why was it vendor imported. Please consider backing out > > (the way only cvs@) the NOP commits. > > What?? If the vendor branch offends you, ignore it. Pretend I "cvs add"ed > it. We stopped vendor importing ports for a reason. Anyway what makes you think a vendor branch offends me? What offends me is graciously and needlessly taking files off the vendor branch. -- -- David (obrien@FreeBSD.org) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message