From owner-svn-src-stable-9@FreeBSD.ORG Mon Feb 16 16:25:02 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 487B2C06; Mon, 16 Feb 2015 16:25:02 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1F43DDCD; Mon, 16 Feb 2015 16:25:02 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-54-116-245.nwrknj.fios.verizon.net [173.54.116.245]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id BCBD2B93A; Mon, 16 Feb 2015 11:25:00 -0500 (EST) From: John Baldwin To: Garrett Cooper Subject: Re: svn commit: r278718 - in stable/9: etc/rc.d sbin share/man/man4 share/mk sys/modules/geom tools/build/mk tools/build/options Date: Mon, 16 Feb 2015 11:11:35 -0500 Message-ID: <5328252.MWfFGgsrnY@ralph.baldwin.cx> User-Agent: KMail/4.14.2 (FreeBSD/10.1-STABLE; KDE/4.14.2; amd64; ; ) In-Reply-To: <201502132136.t1DLaHLi008470@svn.freebsd.org> References: <201502132136.t1DLaHLi008470@svn.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Mon, 16 Feb 2015 11:25:00 -0500 (EST) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2015 16:25:02 -0000 On Friday, February 13, 2015 09:36:17 PM Garrett Cooper wrote: > Author: ngie > Date: Fri Feb 13 21:36:16 2015 > New Revision: 278718 > URL: https://svnweb.freebsd.org/changeset/base/278718 > > Log: > MFC r278717: > > r278717: > > MFC r277678: > > r277678: > > Add MK_CCD knob for building and installing ccd(4), ccdconfig, etc > > Sponsored by: EMC / Isilon Storage Division I believe you are supposed to merge from HEAD to 9, not from 10 to 9. But also, I find these log messages quite noisy. I much prefer just: MFC : Where the is not extra-indented but is formatted similar to a normal commit. On a more general note, if I'm merging a change with several followup fixes, I 1) always merge the entire batch of changes so as not to leave stable/ in a broken state (most folks also do this), and 2) I don't cut and paste all N logs verbatim. This tends to be very hard to read. Instead, I do 'MFC ' and then use a brief summary of the change being merged. Often this means using the log message of the first change (which introduces the new feature and explains it) but omitting short descriptions of specific bugs fixed (which aren't very useful to someone reading the stable log message as the commit in question is introducing the needed feature in its fixed state.) This does require a bit more effort editorial wise, but I think it results in commit logs for stable that are more readable. -- John Baldwin