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

[Doug Barton]

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 <rwatson at FreeBSD.org>
To: developers at 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