From owner-cvs-src@FreeBSD.ORG Thu Feb 19 02:58:50 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 C54C016A508; Thu, 19 Feb 2004 02:58:50 -0800 (PST) Received: from ru.office.ipnet (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 11DD943D1F; Thu, 19 Feb 2004 02:58:50 -0800 (PST) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by ru.office.ipnet (8.12.10/8.12.10) id i1JAwieB008286; Thu, 19 Feb 2004 12:58:44 +0200 (EET) (envelope-from ru) Date: Thu, 19 Feb 2004 12:58:44 +0200 From: Ruslan Ermilov To: Andrey Chernov , Nate Lawson , src-committers@FreeBSD.org, cvs-src@FreeBSD.org Message-ID: <20040219105844.GA8234@ip.net.ua> References: <20040217165128.GB27143@tara.freenix.org> <20040218012226.GA16022@nagual.pp.ru> <20040218060253.GA42832@tara.freenix.org> <20040218110713.GG54588@FreeBSD.org.ua> <20040218094753.Q35672@root.org> <20040218184138.GA954@ip.net.ua> <20040218113222.K36275@root.org> <20040218200820.GA27243@nagual.pp.ru> <20040219085620.GC5351@ip.net.ua> <20040219090617.GB53685@nagual.pp.ru> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="tKW2IUtsqtDRztdT" Content-Disposition: inline In-Reply-To: <20040219090617.GB53685@nagual.pp.ru> User-Agent: Mutt/1.5.6i Subject: Re: cvs commit: src/contrib/groff FREEBSD-Xlist src/contrib/groff/src/include getopt.h src/contrib/groff/src/libs/libgroff getopt.c 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: Thu, 19 Feb 2004 10:58:50 -0000 --tKW2IUtsqtDRztdT Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Feb 19, 2004 at 12:06:17PM +0300, Andrey Chernov wrote: > On Thu, Feb 19, 2004 at 10:56:20AM +0200, Ruslan Ermilov wrote: > > What Nate means is that now (e.g., for Groff) after you do the next > > import, and do the checkout on the FSF branch, it will still contain > > the getopt.h file, which it should not. >=20 > Why not? getopt* files still needed for non-current FreeBSD, so they must= =20 > present in the FSF branch and not removed from there. >=20 I think you're confused here. When you remove getopt.h in FSF or HEAD, it will still exist in other RELENG_* branches. The reason to remove it on the FSF branch is because you've added it to FREEBSD-Xlist, so it won't be imported next time, and "cvs co -rFSF" after the next import will check out a possibly outdated getopt.h file, if we don't remove it on FSF branch after a new import. If you didn't put it in FREEBSD-Xlist (which is one of the options, too), it will continue to exist on the FSF branch, will get new v_X_Y tags, so no need to remove it on FSF, but it will cause conflicts on future imports that modify getopt.h. I personally think such conflicts are harmless. > > Andrey, please DO NOT do anything on vendor branches of at least > > Groff and Texinfo while we're discussing things, and didn't come > > up to an agreement. Pretty much please. >=20 > I already finish with getopt*. There was getopt* left in cvs and binutils, > but they can't be replaced. >=20 I mean: don't "cvs rm" getopt* on vendor branches yet. Cheers, --=20 Ruslan Ermilov FreeBSD committer ru@FreeBSD.org --tKW2IUtsqtDRztdT Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQFANJbkUkv4P6juNwoRAh/mAJ9BvZ0RydnqUy4pUGLFTIyKHckKywCgjOkF ZLgKZLZzuFoHxW8BPHLC5Nc= =hp4n -----END PGP SIGNATURE----- --tKW2IUtsqtDRztdT--