cvs commit: src UPDATING src/sys/netgraph netgraph.h ng_message.h src/sys/netgraph/bluetooth/include ng_btsocket.h

[Ruslan Ermilov]

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 ...]
> 
> 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.
> 
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,
-- 
Ruslan Ermilov
ru at FreeBSD.org
FreeBSD committer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-src/attachments/20040820/39c376ac/attachment.bin