From owner-cvs-src@FreeBSD.ORG Thu Feb 19 08:36:26 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 C40C816A4CE; Thu, 19 Feb 2004 08:36:26 -0800 (PST) Received: from nagual.pp.ru (pobrecita.freebsd.ru [194.87.13.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D86843D1D; Thu, 19 Feb 2004 08:36:26 -0800 (PST) (envelope-from ache@pobrecita.freebsd.ru) Received: from pobrecita.freebsd.ru (ache@localhost [127.0.0.1]) by nagual.pp.ru (8.12.11/8.12.11) with ESMTP id i1JGaP9e059460; Thu, 19 Feb 2004 19:36:25 +0300 (MSK) (envelope-from ache@pobrecita.freebsd.ru) Received: (from ache@localhost) by pobrecita.freebsd.ru (8.12.11/8.12.11/Submit) id i1JGaPmc059459; Thu, 19 Feb 2004 19:36:25 +0300 (MSK) (envelope-from ache) Date: Thu, 19 Feb 2004 19:36:25 +0300 From: Andrey Chernov To: Ruslan Ermilov Message-ID: <20040219163625.GA59399@nagual.pp.ru> Mail-Followup-To: Andrey Chernov , Ruslan Ermilov , Nate Lawson , src-committers@FreeBSD.org, cvs-src@FreeBSD.org References: <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> <20040219105844.GA8234@ip.net.ua> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-md5; protocol="application/pgp-signature"; boundary="+QahgC5+KEYLbs62" Content-Disposition: inline In-Reply-To: <20040219105844.GA8234@ip.net.ua> User-Agent: Mutt/1.5.5.1i cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: Nate Lawson 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 16:36:26 -0000 --+QahgC5+KEYLbs62 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Feb 19, 2004 at 12:58:44PM +0200, Ruslan Ermilov wrote: > I think you're confused here. When you remove getopt.h in FSF or > HEAD, it will still exist in other RELENG_* branches. It doesn't matter, is it still exist in other RELENG_* branches, because somebody checking out vendor branch not get whole picture after removing =66rom it, and those still exist in other branches will be lost from the sight this way. > 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. What I suggest to clarify this confusion is removing getopt* from FREEBSD-Xlist's and put them into FREEBSD-deleted, see my other message where FREEBSD-deleted role explained. --=20 Andrey Chernov | http://ache.pp.ru/ --+QahgC5+KEYLbs62 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iQCVAwUBQDTmCeJgpPLZnQjrAQE9+QQAimIPaXBrjSsZtgme8DrWc1SaW2k2L2fL pWh1eolxGG3Gzq+MBWrHDS/GjdVZaA6ennqU6Bfy9Z3myzOvZaf0uWy67RUGAsoy LZcLa47tZaEpjS+MsLhdyVxKbusVEVT+/xdsaHIlAdm+++o+mPP/bhxqQvGPP0gF yGx1m/gbKQE= =W57i -----END PGP SIGNATURE----- --+QahgC5+KEYLbs62--