Date: Wed, 18 Feb 2004 12:58:59 +0200 From: Ruslan Ermilov <ru@FreeBSD.org> To: Dag-Erling Sm?rgrav <des@des.no> Cc: cvs-src@FreeBSD.org Subject: Re: cvs commit: src/contrib/gcc FREEBSD-Xlist FREEBSD-deletelist getopt.c getopt.h getopt1.c Message-ID: <20040218105859.GF54588@FreeBSD.org.ua> In-Reply-To: <xzpu11ouaf3.fsf@dwp.des.no> References: <200402170322.i1H3MZhf074789@repoman.freebsd.org> <20040217223751.GA33586@dragon.nuxi.com> <20040218013759.GA16382@nagual.pp.ru> <xzpu11ouaf3.fsf@dwp.des.no>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <ache@nagual.pp.ru> 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040218105859.GF54588>