From owner-cvs-src@FreeBSD.ORG Wed Feb 18 02:58:23 2004 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3F59516A4CE; Wed, 18 Feb 2004 02:58:23 -0800 (PST) Received: from phantom.cris.net (phantom.cris.net [212.110.130.74]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F19943D2D; Wed, 18 Feb 2004 02:58:19 -0800 (PST) (envelope-from ru@FreeBSD.org.ua) Received: from phantom.cris.net (ru@localhost [127.0.0.1]) by phantom.cris.net (8.12.10/8.12.10) with ESMTP id i1IAx1mt061529; Wed, 18 Feb 2004 12:59:01 +0200 (EET) (envelope-from ru@FreeBSD.org.ua) Received: (from ru@localhost) by phantom.cris.net (8.12.10/8.12.10/Submit) id i1IAwxC3061524; Wed, 18 Feb 2004 12:58:59 +0200 (EET) (envelope-from ru) Date: Wed, 18 Feb 2004 12:58:59 +0200 From: Ruslan Ermilov To: Dag-Erling Sm?rgrav Message-ID: <20040218105859.GF54588@FreeBSD.org.ua> References: <200402170322.i1H3MZhf074789@repoman.freebsd.org> <20040217223751.GA33586@dragon.nuxi.com> <20040218013759.GA16382@nagual.pp.ru> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="SNIs70sCzqvszXB4" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.5.1i cc: Andrey Chernov cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org cc: David O'Brien cc: cvs-src@FreeBSD.org Subject: Re: cvs commit: src/contrib/gcc FREEBSD-Xlist FREEBSD-deletelist getopt.c getopt.h getopt1.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Feb 2004 10:58:23 -0000 --SNIs70sCzqvszXB4 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Feb 18, 2004 at 08:14:08AM +0100, Dag-Erling Sm?rgrav wrote: > Andrey Chernov writes: > > Hmm. Seeeng FREEBSD-deletelist and FREEBSD-Xlist I find that we _do_ > > remove unused files in contrib [...] >=20 > No. FREEBSD-Xlist lists files that are deleted *before the import*. > If you really *must* delete those files and add them to FREEBSD-Xlist, > you must delete them on the vendor branch and not in HEAD. >=20 Not quite. "cvs checkout -rVENDOR" should produce the same set as "cvs checkout -rv_latest_version", so these files should not be removed just yet. On the next Groff and Texinfo imports though, I will "cvs remove" files on FSF (vendor) branch that were not imported. Having said that, an alternative approach is to just remove such files on HEAD, and don't touch FREEBSD-Xlist -- the next import will report these as conflicts (if there were changes in getopt* files), but these should be harmless. I think I prefer to keep it this way with Groff, and the other way with Texinfo (due to historical reasons), so I might want to revert the change to contrib/groff/FREEBSD-Xlist, but I have not decided it yet. Cheers, --=20 Ruslan Ermilov FreeBSD committer ru@FreeBSD.org --SNIs70sCzqvszXB4 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQFAM0VzUkv4P6juNwoRAnlSAJ9bRPvimKBmrJ9g45iI+gy4b7akGgCdGIDG MRl7bSprLym3g0lNnTiZLGU= =xII/ -----END PGP SIGNATURE----- --SNIs70sCzqvszXB4--