From owner-cvs-src@FreeBSD.ORG Fri Aug 20 14:54:32 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 2062C16A4CE; Fri, 20 Aug 2004 14:54:32 +0000 (GMT) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 572A043D46; Fri, 20 Aug 2004 14:54:31 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from heffalump.ip.net.ua (heffalump.ip.net.ua [82.193.96.213]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id i7KEsOas054413 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 20 Aug 2004 17:54:25 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.13.1/8.13.1) id i7KEsQSH092742; Fri, 20 Aug 2004 17:54:26 +0300 (EEST) (envelope-from ru) Date: Fri, 20 Aug 2004 17:54:26 +0300 From: Ruslan Ermilov To: Eivind Eklund Message-ID: <20040820145426.GB92603@ip.net.ua> References: <200408200124.i7K1ONcF095627@repoman.freebsd.org> <20040820081918.GC27365@ip.net.ua> <20040820123859.GC1196@electra.cse.Buffalo.EDU> <20040820131454.GD2388@FreeBSD.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="QTprm0S8XgL7H0Dt" Content-Disposition: inline In-Reply-To: <20040820131454.GD2388@FreeBSD.org> User-Agent: Mutt/1.5.6i X-Virus-Scanned: by amavisd-new cc: cvs-src@FreeBSD.org cc: Ken Smith cc: cvs-all@FreeBSD.org cc: src-committers@FreeBSD.org Subject: Re: cvs commit: src UPDATING src/sys/netgraph netgraph.h ng_message.h src/sys/netgraph/bluetooth/include ng_btsocket.h 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: Fri, 20 Aug 2004 14:54:32 -0000 --QTprm0S8XgL7H0Dt Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Aug 20, 2004 at 01:14:54PM +0000, Eivind Eklund wrote: > On Fri, Aug 20, 2004 at 08:38:59AM -0400, Ken Smith wrote: > [... stuff about when MFC becomes "normal" again ...] >=20 > I suggest replacing "MFC" with "MT4" (merge to 4.x) and "MT5" (merge to > 5) for the case where we are indicating planned merges. We regularly > get into the situation where we have several branches to merge to, and > the MFC terminology is quite limiting. MFC was introduced as a tag used > in commit messages when the merge was being done, and the "MFC after" > usage was a natural evolution at a point where any non-RELENG_4 MFC was > a quite special case. >=20 Changing to this would lose the "from" information, which is quite useful, as we sometimes merge not only from -CURRENT. If it's about to change, I suggest using the following template: MFC [into ] (after|in): Out of most popular Merge From's (MFC, MFV, and MF4), only "MFC" needs to be reminded about. The MFC reminder script and CVS commit template would have to be updated for this to work. Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --QTprm0S8XgL7H0Dt Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.5 (FreeBSD) iD8DBQFBJhCiqRfpzJluFF4RAkpSAJ4h9uSIKCAfF/FPidVUJFualdKzvgCeNMec SPyz3r+zPmZ2U9bciuJ3Gdw= =T0cK -----END PGP SIGNATURE----- --QTprm0S8XgL7H0Dt--