From owner-cvs-src@FreeBSD.ORG Fri Aug 20 22:44:51 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 E4FF316A4CE; Fri, 20 Aug 2004 22:44:51 +0000 (GMT) Received: from harmony.village.org (rover.village.org [168.103.84.182]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A77343D2F; Fri, 20 Aug 2004 22:44:51 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.11/8.12.11) with ESMTP id i7KMibmL028118; Fri, 20 Aug 2004 16:44:38 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Fri, 20 Aug 2004 16:44:47 -0600 (MDT) Message-Id: <20040820.164447.59920379.imp@bsdimp.com> To: kensmith@cse.Buffalo.EDU From: "M. Warner Losh" In-Reply-To: <20040820123859.GC1196@electra.cse.Buffalo.EDU> References: <200408200124.i7K1ONcF095627@repoman.freebsd.org> <20040820081918.GC27365@ip.net.ua> <20040820123859.GC1196@electra.cse.Buffalo.EDU> X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: julian@FreeBSD.org cc: src-committers@FreeBSD.org cc: ru@FreeBSD.org cc: cvs-all@FreeBSD.org cc: cvs-src@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 22:44:52 -0000 In message: <20040820123859.GC1196@electra.cse.Buffalo.EDU> Ken Smith writes: : On Fri, Aug 20, 2004 at 11:19:18AM +0300, Ruslan Ermilov wrote: : : > We need to be careful with using "MFC" now. What does it mean, RELENG_5, : > RELENG_4, or both? ;) : : This problem will continue for a while too unfortunately. :-( : : If all goes as planned (which it never seems to...) shortly after the : 5.X release RELENG_5 becomes -stable. HEAD as always will be -current. : But RELENG_4 will still be an active development branch and the target : of at least some normal developer-generated commits until we release : 4.11. After 4.11 is released the current plan is to turn over RELENG_4 : (as well as RELENG_4_11) to so@ and it becomes an Errata Branch. : : So, after the 4.11 release we'll be back to the normal terminology : being adequate but until then it's gonna be a bit weird... :-( Of course MFC After just generates email to the person doing the commit as a reminder.. One would presume that they would know where they are going to merge it. And if they are doing an N way merge, they can always use stage N-1 to clock stage N (eg when merging to 5, they could have a MFC for the merge to 4). Warner