Date: Fri, 20 Aug 2004 17:54:26 +0300 From: Ruslan Ermilov <ru@FreeBSD.org> To: Eivind Eklund <eivind@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 Message-ID: <20040820145426.GB92603@ip.net.ua> In-Reply-To: <20040820131454.GD2388@FreeBSD.org> References: <200408200124.i7K1ONcF095627@repoman.freebsd.org> <20040820081918.GC27365@ip.net.ua> <20040820123859.GC1196@electra.cse.Buffalo.EDU> <20040820131454.GD2388@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <branch>] (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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040820145426.GB92603>