From owner-cvs-all Sat Mar 30 13:35:25 2002 Delivered-To: cvs-all@freebsd.org Received: from storm.FreeBSD.org.uk (storm.FreeBSD.org.uk [194.242.139.170]) by hub.freebsd.org (Postfix) with ESMTP id 4A1E737B404; Sat, 30 Mar 2002 13:35:18 -0800 (PST) Received: (from uucp@localhost) by storm.FreeBSD.org.uk (8.11.6/8.11.6) with UUCP id g2ULZHs86751; Sat, 30 Mar 2002 21:35:17 GMT (envelope-from mark@grimreaper.grondar.za) Received: from grimreaper (localhost [127.0.0.1]) by grimreaper.grondar.org (8.12.2/8.12.2) with ESMTP id g2ULWSPL025623; Sat, 30 Mar 2002 21:32:28 GMT (envelope-from mark@grimreaper.grondar.za) Message-Id: <200203302132.g2ULWSPL025623@grimreaper.grondar.org> To: obrien@FreeBSD.org 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 References: <20020330012421.A74485@dragon.nuxi.com> In-Reply-To: <20020330012421.A74485@dragon.nuxi.com> ; from "David O'Brien" "Sat, 30 Mar 2002 01:24:22 PST." Date: Sat, 30 Mar 2002 21:32:28 +0000 From: Mark Murray 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 > Fixes are fine. 1/3 of this commit did not contain fixes -- append.c, Wrong. Append.c: diff -u -d -r1.1.1.1 -r1.2 --- append.c 22 Mar 2002 13:53:52 -0000 1.1.1.1 +++ append.c 24 Mar 2002 15:59:17 -0000 1.2 @@ -39,9 +39,14 @@ #include "sort.h" #ifndef lint +#if 0 __RCSID("$NetBSD: append.c,v 1.9 2001/01/18 20:59:43 jdolecek Exp $"); __SCCSID("@(#)append.c 8.1 (Berkeley) 6/6/93"); +#endif #endif /* not lint */ + +#include +__FBSDID("$FreeBSD: src/usr.bin/sort/append.c,v 1.2 2002/03/24 15:59:17 markm E xp $"); #include #include > msort.c, tmp.c. You also dicked around with the vendor __COPYRIGHT, > which we don't do. I get the impression that you are arguing for the sake of it. I fixed _problems_. M -- o Mark Murray \_ O.\_ Warning: this .sig is umop ap!sdn To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message