From owner-freebsd-doc Tue May 14 15: 1:51 2002 Delivered-To: freebsd-doc@freebsd.org Received: from mailsrv.otenet.gr (mailsrv.otenet.gr [195.170.0.5]) by hub.freebsd.org (Postfix) with ESMTP id BDF4E37B405 for ; Tue, 14 May 2002 15:01:47 -0700 (PDT) Received: from hades.hell.gr (patr530-a072.otenet.gr [212.205.215.72]) by mailsrv.otenet.gr (8.12.3/8.12.3) with ESMTP id g4EM1X1b012131; Wed, 15 May 2002 01:01:35 +0300 (EEST) Received: from hades.hell.gr (hades [127.0.0.1]) by hades.hell.gr (8.12.3/8.12.3) with ESMTP id g4EM1G87025862; Wed, 15 May 2002 01:01:33 +0300 (EEST) (envelope-from keramida@ceid.upatras.gr) Received: (from charon@localhost) by hades.hell.gr (8.12.3/8.12.3/Submit) id g4ELaCIg024379; Wed, 15 May 2002 00:36:12 +0300 (EEST) (envelope-from keramida@ceid.upatras.gr) Date: Wed, 15 May 2002 00:36:11 +0300 From: Giorgos Keramidas To: Garrett Rooney Cc: Chris Pepper , freebsd-doc@FreeBSD.org Subject: Re: MFC definition? Message-ID: <20020514213611.GA23785@hades.hell.gr> References: <200205141431.g4EEVeC71650@freefall.freebsd.org> <20020514162424.GB42702@electricjellyfish.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20020514162424.GB42702@electricjellyfish.net> User-Agent: Mutt/1.3.99i Sender: owner-freebsd-doc@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org On 2002-05-14 12:24, Garrett Rooney wrote: >On Tue, May 14, 2002 at 12:20:04PM -0400, Chris Pepper wrote: >>At 7:31 AM -0700 2002/05/14, wrote: >>>State-Changed-From-To: open->patched >>>State-Changed-When: Tue May 14 07:31:01 PDT 2002 >>> >>>Committed to CURRENT. I'll handle the MFC. >> >>Thanks. I looked in various places, but couldn't find a >>definition for MFC. Is it "Move From CURRENT"? > > it's "Merge From -CURRENT", and it's already defined in the FAQ: > http://www.freebsd.org/FAQ/misc.html#DEFINE-MFC Oh boy. Ain't it nice? To go out for a coffee, and stay offline for a while to return and see that +inbox is quickly filling up. Thanks to all who speedily replied. On a related sidenote, when I'm closing PRs I should probably spare the Submitter the acronyms :) Chris, MFC is 'Merged from CURRENT' as others have pointed out. The normal thing would be to include in the commit message a line like the following: MFC after: 1 week or something similar. This is not what I did though, since I want to ask the RE team (Release Engineers) for the merge .. we are now in a ``code freeze'' for the release of 4.6-RELEASE :-) -- Giorgos Keramidas - http://www.FreeBSD.org keramida@FreeBSD.org - The Power to Serve To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-doc" in the body of the message