From owner-cvs-all Tue Mar 6 3:50: 6 2001 Delivered-To: cvs-all@freebsd.org Received: from gw.nectar.com (gw.nectar.com [208.42.49.153]) by hub.freebsd.org (Postfix) with ESMTP id 17FB937B71A; Tue, 6 Mar 2001 03:49:51 -0800 (PST) (envelope-from nectar@nectar.com) Received: by gw.nectar.com (Postfix, from userid 1001) id CE16619383; Tue, 6 Mar 2001 05:49:49 -0600 (CST) Date: Tue, 6 Mar 2001 05:49:49 -0600 From: "Jacques A. Vidrine" To: Kris Kennaway Cc: "David E. O'Brien" , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/lib/libc/net getaddrinfo.c Message-ID: <20010306054949.A83938@spawn.nectar.com> Mail-Followup-To: "Jacques A. Vidrine" , Kris Kennaway , "David E. O'Brien" , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org References: <200103051039.f25Ad4K77639@freefall.freebsd.org> <20010305064602.B78960@spawn.nectar.com> <20010305150930.G48459@sunbay.com> <20010305071409.D78960@spawn.nectar.com> <20010305152308.H48459@sunbay.com> <20010306013852.A93529@mollari.cthul.hu> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <20010306013852.A93529@mollari.cthul.hu>; from kris@obsecurity.org on Tue, Mar 06, 2001 at 01:38:52AM -0800 X-Url: http://www.nectar.com/ Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Tue, Mar 06, 2001 at 01:38:52AM -0800, Kris Kennaway wrote: > On Mon, Mar 05, 2001 at 03:23:08PM +0200, Ruslan Ermilov wrote: > > > So that this could be handled automatically. ``cvs di -rKAME'' would > > give the differences to the KAME version, and future merges would not > > interfere (often, wipe out) local mods. > > > > When I fixed all (>2'000) mdoc(7) manual pages, I did not commit > > minor fixes to the files that are on vendor branch. But even if > > I commit these, the file still had a separate vendor branch. > > When Kris asked me to submit my changes to the KAME manpages, I > > was not able to do it, since these did not have any vendor (KAME) > > branch against which I could build the diff. > > Hindsight is a wonderful thing, but it needs a repo master to fix this > now. Just to be clear: Please don't "fix". From my perspective, with the amount of localization that getaddrinfo.c, getpwent.c, and so on need, trying to make a vendor branch on those files is more trouble than it is worth. This thread started because I suggested that for these files, whitespace-only changes are a pain, that's all. Cheers, -- Jacques Vidrine / n@nectar.com / jvidrine@verio.net / nectar@FreeBSD.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message