From owner-svn-src-all@freebsd.org Tue Aug 23 20:38:37 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BCAD9BC409E; Tue, 23 Aug 2016 20:38:37 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id A11B91AB5; Tue, 23 Aug 2016 20:38:37 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id 9964D1473; Tue, 23 Aug 2016 20:38:37 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 1BDF923A39; Tue, 23 Aug 2016 20:38:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id gGIzdoa8xGF2; Tue, 23 Aug 2016 20:38:33 +0000 (UTC) Subject: Re: svn commit: r304567 - head/sys/dev/usb/input DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com BFA9A23A32 To: Bruce Evans , Hans Petter Selasky References: <201608211606.u7LG60pS063983@repo.freebsd.org> <20160822185617.I1897@besplex.bde.org> Cc: Bruce Evans , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: Date: Tue, 23 Aug 2016 13:38:16 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <20160822185617.I1897@besplex.bde.org> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="sDW0aInRvdO9shV324iWNbAq79J5moTFn" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Aug 2016 20:38:37 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --sDW0aInRvdO9shV324iWNbAq79J5moTFn Content-Type: multipart/mixed; boundary="o6v0Tia18Cj0OXTRIj5IrIa56I8fHek37" From: Bryan Drewery To: Bruce Evans , Hans Petter Selasky Cc: Bruce Evans , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: Subject: Re: svn commit: r304567 - head/sys/dev/usb/input References: <201608211606.u7LG60pS063983@repo.freebsd.org> <20160822185617.I1897@besplex.bde.org> In-Reply-To: <20160822185617.I1897@besplex.bde.org> --o6v0Tia18Cj0OXTRIj5IrIa56I8fHek37 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 8/22/2016 1:59 AM, Bruce Evans wrote: > On Sun, 21 Aug 2016, Hans Petter Selasky wrote: >=20 >> On 08/21/16 18:06, Bruce Evans wrote: >>> Author: bde >>> Date: Sun Aug 21 16:06:00 2016 >>> New Revision: 304567 >>> URL: https://svnweb.freebsd.org/changeset/base/304567 >> >> Don't forget to MFC. >=20 > I had forgotten if for this commit. I might do it for combined > commits, but don't have enough svn fu for as many MFCs as I would > like. I want a few things back to FreeBSD-7. >=20 > Bruce >=20 I've written a script to do MFCing with the proper svn merge style for each branch. It's not perfect but it seems good enough. https://people.freebsd.org/~bdrewery/mfc.sh It can take multiple revisions. cd svn/stable/7 mfc.sh r123 r124 r125 It will merge each one at a time, invoke EDITOR for conflicts (SVN does this), then opens EDITOR to edit the commit log and saves that to 'commit'. You can then review and modify the commit as you like and 'svn commit -F commit' when done to use the saved commit log. If you pass -r to it then it will also prepare an email in mutt to send to re@FreeBSD.org for approval to commit. It defaults to merging from head, but in the case of wanting to commit to releng/ you need to pass -b to specify which branch to merge from, such as -b stable/11 for releng/11.0 commits. --=20 Regards, Bryan Drewery --o6v0Tia18Cj0OXTRIj5IrIa56I8fHek37-- --sDW0aInRvdO9shV324iWNbAq79J5moTFn Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJXvLQ4AAoJEDXXcbtuRpfPFlEH/A80sD9fTJXA6h6m0HQ2mPoa 2X6QxaghFpw1up4aQRZMFjFTGOWriVL+Hs0grwQCbHxV+PXkX1NBJwjbBBfr6psU qjq3+zfxBnfxgg17fqNaBwRSZjk0DzvEpP/l8p0vuBq2GDtih3m6jwQi3tfKr1FE FUcQdYMajh7jH7GSaMhk5/wpEKs5Aj0VuFcBgXhK+Goni3NdfmPnmgpP1OcPcyT2 uz+N2IR4K0RXnIpx1jM40pztjgWYxL/ZLZjwCKMUeFJ+czmcv4lqFr7iyMWJI214 4+BDkVs77/g2TA0TsLbXUmq6bw0MAdr6lznGWSF+jvAhGarO7g+Hnb6IhfiJ/40= =yBwA -----END PGP SIGNATURE----- --sDW0aInRvdO9shV324iWNbAq79J5moTFn--