From owner-cvs-all Fri Jul 13 14:35:39 2001 Delivered-To: cvs-all@freebsd.org Received: from winston.freebsd.org (adsl-64-173-15-98.dsl.sntc01.pacbell.net [64.173.15.98]) by hub.freebsd.org (Postfix) with ESMTP id E20D637B401; Fri, 13 Jul 2001 14:35:22 -0700 (PDT) (envelope-from jkh@osd.bsdi.com) Received: from localhost (jkh@localhost [127.0.0.1]) by winston.freebsd.org (8.11.4/8.11.4) with ESMTP id f6DLYvt37641; Fri, 13 Jul 2001 14:34:57 -0700 (PDT) (envelope-from jkh@osd.bsdi.com) To: mike@q9media.com Cc: jkh@osd.bsdi.com, tobex@tobez.org, sobomax@FreeBSD.org, dd@FreeBSD.org, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: Another immediate MFC that isn't really necessary [was: cvs commit: src/libexec/talkd announce.c] In-Reply-To: <200107132117.f6DLHDv25225@coffee.q9media.com> References: <200107132117.f6DLHDv25225@coffee.q9media.com> X-Mailer: Mew version 1.94.1 on Emacs 20.7 / Mule 4.0 (HANANOEN) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-Id: <20010713143457X.jkh@osd.bsdi.com> Date: Fri, 13 Jul 2001 14:34:57 -0700 From: Jordan Hubbard X-Dispatcher: imput version 20000228(IM140) Lines: 34 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG I was referring to the "merge after" keyword that someone asked whether it was documented or not. For the record, I also agree that things *should* go into -current first since there's otherwise a syncronization problem to deal with later, but I'm not sure about the 3 day rule anymore. I think I was the one who originally arrived at that number and wrote it into the handbook, and it was a total finger-in-the-wind guesstimate. For something like a man page spelling fix or an obvious syntax error stumbled across, I have to say that I'm having a hard time defending a "3 day rule" for. - Jordan From: Mike Barcroft Subject: Re: Another immediate MFC that isn't really necessary [was: cvs commit: src/libexec/talkd announce.c] Date: Fri, 13 Jul 2001 17:17:13 -0400 (EDT) > Jordan Hubbard writes: > > I don't think so, and it really should be in the committer's guide. > > That's a strong hint to the folks who implemented it. :) > > No, it's in there. Section 8, Rule 7: > Changes go to -CURRENT before -STABLE unless specifically permitted by > the release engineer or unless they're not applicable to -CURRENT. > Any non-trivial or non-urgent change which is applicable should also > be allowed to sit in -CURRENT for at least 3 days before merging so > that it can be given sufficient testing. The release engineer has the > same authority over the -STABLE branch as outlined for the maintainer > in rule #5. > > > Best regards, > Mike Barcroft To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message