From owner-svn-src-stable-9@FreeBSD.ORG Mon Feb 23 07:59:54 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 AAE6A7C1; Mon, 23 Feb 2015 07:59:54 +0000 (UTC) Received: from mail-pd0-x22f.google.com (mail-pd0-x22f.google.com [IPv6:2607:f8b0:400e:c02::22f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6DECEB8D; Mon, 23 Feb 2015 07:59:54 +0000 (UTC) Received: by pdjy10 with SMTP id y10so23632537pdj.6; Sun, 22 Feb 2015 23:59:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :message-id:references:to; bh=qBEGmGiyKllIb/GajyqW5o/mTA8FWYThTKmnJxE7Lxg=; b=pWNksXyF9GDtWt6BltzZBIgG25cYaerxD2Wc0pjX7s1IEU4i6HKL8tnNLYVV7AEe0B 9payt14k4YvDbC+RRDWdgbdHUH+ZRhnHIvy1hrxdlwWlcr54wxMFO2RtLoQnjq6ov4hD mqSIgzb5D/SlFoS9XakCOWx9tvb8OMUp3mFoJ7UjZ0JDrCAvH+EV5nuPpEykVq7OSn46 tKpCZVHwCnvMf/uhR0enYDNAXg665Vytpz8prFR+n26Js6YhXF97mKKmXEPWBVyDfBPV gq+Q1M7+YJGtw2IZuKaM91bslLHXgX/v+6u0OVaSDbvXFBpSG9nOuszNO88NFLa3oL6P aoeA== X-Received: by 10.66.221.166 with SMTP id qf6mr16736170pac.97.1424678393854; Sun, 22 Feb 2015 23:59:53 -0800 (PST) Received: from ?IPv6:2601:8:ab80:7d6:cf:f06:6d4d:7abf? ([2601:8:ab80:7d6:cf:f06:6d4d:7abf]) by mx.google.com with ESMTPSA id ff10sm35015681pad.1.2015.02.22.23.59.52 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 22 Feb 2015 23:59:53 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_D41C2C07-DF15-44A9-BEAE-9B6C28587346"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) 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 From: Garrett Cooper In-Reply-To: <5328252.MWfFGgsrnY@ralph.baldwin.cx> Date: Sun, 22 Feb 2015 23:59:52 -0800 Message-Id: References: <201502132136.t1DLaHLi008470@svn.freebsd.org> <5328252.MWfFGgsrnY@ralph.baldwin.cx> To: John Baldwin X-Mailer: Apple Mail (2.1878.6) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers , svn-src-stable-9@freebsd.org, Garrett Cooper 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, 23 Feb 2015 07:59:54 -0000 --Apple-Mail=_D41C2C07-DF15-44A9-BEAE-9B6C28587346 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Feb 16, 2015, at 8:11, John Baldwin wrote: > 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 >>=20 >> Log: >> MFC r278717: >>=20 >> r278717: >>=20 >> MFC r277678: >>=20 >> r277678: >>=20 >> Add MK_CCD knob for building and installing ccd(4), ccdconfig, = etc >>=20 >> Sponsored by: EMC / Isilon Storage Division >=20 > I believe you are supposed to merge from HEAD to 9, not from 10 to 9. =20= I try to do that where it makes sense. Merging and redoing some of the = work I did going from head to head-1 increases the likelihood of error = (especially with all of the build system refactoring that took place in = the past year). > But also, I find these log messages quite noisy. I much prefer just: >=20 > MFC : > >=20 > Where the is not extra-indented but is = formatted=20 > similar to a normal commit. I was doing that [subjectively] for readability, but that=92s ok, I=92ll = take out the extra indentation. > On a more general note, if I'm merging a change with several followup = fixes, I=20 > 1) always merge the entire batch of changes so as not to leave stable/ = in a=20 > broken state (most folks also do this), and 2) I don't cut and paste = all N=20 > logs verbatim. This tends to be very hard to read. Instead, I do = 'MFC of head revs>' and then use a brief summary of the change being = merged. Often=20 > this means using the log message of the first change (which introduces = the new=20 > feature and explains it) but omitting short descriptions of specific = bugs=20 > fixed (which aren't very useful to someone reading the stable log = message as=20 > the commit in question is introducing the needed feature in its fixed = state.) >=20 > This does require a bit more effort editorial wise, but I think it = results in=20 > commit logs for stable that are more readable. Sure. I wish that there was a set format for this. All of this is scripted for = me, so merging is a trivial task =97 it=92s just a bit confusing when I = have 5 different people telling me my MFC message is wrong, but oh well=85= it=92s just a script. Lol. Thanks :), --Apple-Mail=_D41C2C07-DF15-44A9-BEAE-9B6C28587346 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJU6t34AAoJEMZr5QU6S73eCnQIAKDoJ7PcyrMok1pubDHtVfWb V9F6YcJt0oTrQRFCyMiya7ITTX2bhBmIxO9fu/F+FwqVDTuzmnGlOw7nGGa0HTf/ d85br0KKS4O7cMm1/jGiNLj87AiwXrPK8YE2bYuhYbMzs95Efyessf3Fo2LBWPqh 6PvBiwJbz8mAqG3nZrlUgwLWOkOlunrfWo/oWvlWFucJcISspnawtiZ+2qP4C1j8 vGd1m8YdN7CJtDTrbiYunPLOgDm4IkyKo6EdhbJwteCiL/0qdenvfEv6z7RpgObS JKpzt1wZ1P4f5t7dWOUQ0CY11FI8jE/KAs3plCRDrh+z+jzcnC7PX2SoeskzQoE= =mPjj -----END PGP SIGNATURE----- --Apple-Mail=_D41C2C07-DF15-44A9-BEAE-9B6C28587346--