From owner-svn-src-stable-8@FreeBSD.ORG Wed Sep 2 16:06:54 2009 Return-Path: Delivered-To: svn-src-stable-8@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6713D10656A7 for ; Wed, 2 Sep 2009 16:06:54 +0000 (UTC) (envelope-from scf@FreeBSD.org) Received: from mail.farley.org (mail.farley.org [IPv6:2001:470:1f0f:20:2::11]) by mx1.freebsd.org (Postfix) with ESMTP id 0C18C8FC0C for ; Wed, 2 Sep 2009 16:06:53 +0000 (UTC) Received: from thor.farley.org (HPooka@thor.farley.org [IPv6:2001:470:1f0f:20:1::5]) by mail.farley.org (8.14.3/8.14.3) with ESMTP id n82G6qdh030615; Wed, 2 Sep 2009 11:06:52 -0500 (CDT) (envelope-from scf@FreeBSD.org) Date: Wed, 2 Sep 2009 11:06:52 -0500 (CDT) From: "Sean C. Farley" To: Ken Smith In-Reply-To: <1251905775.24711.32.camel@bauer.cse.buffalo.edu> Message-ID: References: <200909020212.n822C7Il078379@svn.freebsd.org> <8497dc1520e5fe6b2b3727d5fb92f358.squirrel@www.jr-hosting.nl> <4A9E8BBE.9060000@FreeBSD.org> <1251905775.24711.32.camel@bauer.cse.buffalo.edu> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII X-Spam-Status: No, score=-2.8 required=4.0 tests=AWL,BAYES_00,NO_RELAYS autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on mail.farley.org Cc: Doug Barton , svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org, Alfred Perlstein , remko@elvandar.org, svn-src-stable-8@FreeBSD.org, src-committers@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-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2009 16:06:54 -0000 On Wed, 2 Sep 2009, 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. :-) > > 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). Personally, I like to include the entire message to prevent having to scan the logs for the original commit(s), however, an alternative would be to have the MFC include a URL to the original commit. Two options would be: 1. Automatic insertion into log message with a Subversion hook which adds a URL from scanning a special code in the MFC message (MFC r12345,12346-12349). Of course, this takes more initial setup and education for committers (at least me :)) to use it correctly. 2. Committer can use a special base URL that is agreed to never change. This would make it easier to find the original log message without having to scan for it. Sean -- scf@FreeBSD.org