From owner-svn-src-head@freebsd.org Tue Aug 23 20:57:04 2016 Return-Path: Delivered-To: svn-src-head@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 C2405BC4657; Tue, 23 Aug 2016 20:57:04 +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 A3BC91A73; Tue, 23 Aug 2016 20:57:04 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id 96A021BBE; Tue, 23 Aug 2016 20:57:04 +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 5A88523ACB; Tue, 23 Aug 2016 20:57:04 +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 tyA4cpJM8asO; Tue, 23 Aug 2016 20:57:01 +0000 (UTC) Subject: Re: svn commit: r304567 - head/sys/dev/usb/input DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 5EE9723ABC To: "Ngie Cooper (yaneurabeya)" References: <201608211606.u7LG60pS063983@repo.freebsd.org> <20160822185617.I1897@besplex.bde.org> Cc: Bruce Evans , Hans Petter Selasky , Bruce Evans , src-committers , 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: <55444c61-f280-265a-e223-52b128382b71@FreeBSD.org> Date: Tue, 23 Aug 2016 13:57:00 -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: Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="JNqCEshKG4Iv8McndVb1NW1DgNoT0K4vR" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Aug 2016 20:57:04 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --JNqCEshKG4Iv8McndVb1NW1DgNoT0K4vR Content-Type: multipart/mixed; boundary="6VW66JfcqXA1Vv5T2iT6Fpn785i6fDs6V" From: Bryan Drewery To: "Ngie Cooper (yaneurabeya)" Cc: Bruce Evans , Hans Petter Selasky , Bruce Evans , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <55444c61-f280-265a-e223-52b128382b71@FreeBSD.org> Subject: Re: svn commit: r304567 - head/sys/dev/usb/input References: <201608211606.u7LG60pS063983@repo.freebsd.org> <20160822185617.I1897@besplex.bde.org> In-Reply-To: --6VW66JfcqXA1Vv5T2iT6Fpn785i6fDs6V Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 8/23/2016 1:49 PM, Ngie Cooper (yaneurabeya) wrote: >=20 >> On Aug 23, 2016, at 13:38, Bryan Drewery wrote:= >=20 > =85 >=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 doe= s >> 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 's= vn >> 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 sen= d >> 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 > I have one that I noted a while back =97 it=92s a bit less featureful, = but it works pretty well IMHO: >=20 > https://github.com/yaneurabeya/scratch/blob/master/common/home/ngie/bin= /mfc > https://github.com/yaneurabeya/scratch/blob/master/common/home/ngie/bin= /mfc_log >=20 > Example usage: >=20 > ~/mfc ^/head > # Do whatever you need to make sure that the commit is ok. > svn ci -F commit >=20 > The only thing it fubars is some of the spacing with some of the commit= messages (I don=92t remember if it was with my commits being MFCed or ot= her=92s commits being MFCed). I=92m a bit pedantic about formatting -- th= at=92s the only reason why I haven=92t posted it up earlier as an officia= l solution for others to use. >=20 Well yours only supports stable/10+ and not 9- with the older merge style= =2E --=20 Regards, Bryan Drewery --6VW66JfcqXA1Vv5T2iT6Fpn785i6fDs6V-- --JNqCEshKG4Iv8McndVb1NW1DgNoT0K4vR 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 iQEcBAEBAgAGBQJXvLicAAoJEDXXcbtuRpfPIFMH/isf0u+hTw/gpspT1RcxNSeN uRAbDGMksOeOM63bdccjBFQB/ixRmR9nfqR2YaN9QUU703QVgUnhkuQVAnEveRiP +U95isHsxDd7y6hjtLhW/xTHUa1NFLiNueIsD/QQE/rvQBFX1zR26KkQKGtUhJOm eNyrHTZn5BBBAQthkhUIkQRQSsfgOT7wLZU0qBBLB+WfpHNRfXNBTZHJzKZzqtZ/ iMqZOoWItrNF9d9PxrDv4gDQra0jqu2JiIob1QctvvrWOrRSKy+1UUKQknqMZwEJ z/EvetMZbAu7NbV4EwIErxk/EdBrSdkt+o4m+C18DSTIeRo6O/OjZvbmmXvS8t4= =wBtm -----END PGP SIGNATURE----- --JNqCEshKG4Iv8McndVb1NW1DgNoT0K4vR--