From owner-cvs-all Tue Mar 6 1:39: 2 2001 Delivered-To: cvs-all@freebsd.org Received: from obsecurity.dyndns.org (adsl-63-207-60-158.dsl.lsan03.pacbell.net [63.207.60.158]) by hub.freebsd.org (Postfix) with ESMTP id DA44437B718; Tue, 6 Mar 2001 01:38:53 -0800 (PST) (envelope-from kris@obsecurity.org) Received: by obsecurity.dyndns.org (Postfix, from userid 1000) id D768166ED5; Tue, 6 Mar 2001 01:38:52 -0800 (PST) Date: Tue, 6 Mar 2001 01:38:52 -0800 From: Kris Kennaway To: "Jacques A. Vidrine" , "David E. O'Brien" , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/lib/libc/net getaddrinfo.c Message-ID: <20010306013852.A93529@mollari.cthul.hu> References: <200103051039.f25Ad4K77639@freefall.freebsd.org> <20010305064602.B78960@spawn.nectar.com> <20010305150930.G48459@sunbay.com> <20010305071409.D78960@spawn.nectar.com> <20010305152308.H48459@sunbay.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-md5; protocol="application/pgp-signature"; boundary="7AUc2qLy4jB3hD7Z" Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <20010305152308.H48459@sunbay.com>; from ru@FreeBSD.org on Mon, Mar 05, 2001 at 03:23:08PM +0200 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG --7AUc2qLy4jB3hD7Z Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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. >=20 > 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. Anyway, there were only a few KAME manpages which you touched -- is it really too hard to diff the relevant versions by hand? If you don't do the work, then someone else is going to have to work harder the next time we do a KAME import, when there are a mass of conflicting changes which need to be resolved. Kris --7AUc2qLy4jB3hD7Z Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.4 (FreeBSD) Comment: For info see http://www.gnupg.org iD8DBQE6pLAsWry0BWjoQKURAryvAJ9+H93RRfFe4qAixTZa3/g1VLPHeACgoQtG WORkTEiVbLdD9qY8gXzWg+U= =Yeim -----END PGP SIGNATURE----- --7AUc2qLy4jB3hD7Z-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message