From owner-svn-src-stable@FreeBSD.ORG Wed Sep 2 15:57:45 2009 Return-Path: Delivered-To: svn-src-stable@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A94A21065676 for ; Wed, 2 Sep 2009 15:57:45 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with ESMTP id 507858FC12 for ; Wed, 2 Sep 2009 15:57:45 +0000 (UTC) Received: (qmail 7666 invoked by uid 399); 2 Sep 2009 15:57:42 -0000 Received: from localhost (HELO foreign.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 2 Sep 2009 15:57:42 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4A9E95F1.9070309@FreeBSD.org> Date: Wed, 02 Sep 2009 08:57:37 -0700 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0.0.23 (X11/20090822) MIME-Version: 1.0 To: Ken Smith References: <200909020212.n822C7Il078379@svn.freebsd.org> <8497dc1520e5fe6b2b3727d5fb92f358.squirrel@www.jr-hosting.nl> <4A9E8BBE.9060000@FreeBSD.org> <1251905775.24711.32.camel@bauer.cse.buffalo.edu> In-Reply-To: <1251905775.24711.32.camel@bauer.cse.buffalo.edu> X-Enigmail-Version: 0.96.0 OpenPGP: id=D5B2F0FB Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: remko@elvandar.org, svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org, Alfred Perlstein , src-committers@FreeBSD.org, svn-src-stable-8@FreeBSD.org Subject: Re: svn commit: r196746 - in stable/8/sys: . amd64/include/xen cddl/contrib/opensolaris contrib/dev/acpica contrib/pf dev/usb dev/usb/input dev/xen/xenpci X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2009 15:57:45 -0000 Ken Smith wrote: > On Wed, 2009-09-02 at 08:14 -0700, Doug Barton wrote: >> That said, for RELENG_8 commits during the freeze re@ did ask in one >> of their many messages about commit approvals to paste the complete >> commit message in the MFC. So, bad Alfred, no cookie. :) > > Just for clarification... We ask that you send your complete *proposed > commit message* in your *approval request*. We didn't say that your > commit message needs to include all of the text from the commit to head. > > So, bad Doug, no cookie. :-) -------- Original Message -------- Subject: Repost: approval request and merge guidelines during release cycle Date: Sun, 16 Aug 2009 10:29:58 +0100 (BST) From: Robert Watson To: developers@FreeBSD.org [...] 5. When committing the merge, include the original revision number (rXXXXXX) and a copy of the original commit message in the merge commit message. But you're the boss, so whatever you say goes. :) (I would like my cookie back though.) > FWIW my preference is, as usual, somewhere in between the two extremes. > Duplicating a lengthy commit message in a merge is overkill but in those > cases a short (one sentence max) summary of what changed being in the > merge commit message is helpful. For example when looking through the > commits for release notes fodder it can help. It also helps people who > take the peer review of commits being done seriously to get the warm > fuzzy feeling that the merge wasn't an accidental mis-merge (by seeing > that the code seems to match the brief description). Seriously though, I agree with you, and will be happy to continue complying with this policy going forward. :) Doug -- This .signature sanitized for your protection