Date: Tue, 23 Aug 2016 13:38:16 -0700 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Bruce Evans <brde@optusnet.com.au>, Hans Petter Selasky <hps@selasky.org> Cc: Bruce Evans <bde@freebsd.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r304567 - head/sys/dev/usb/input Message-ID: <bfe42b05-fb8b-2df7-d829-ba7bf640d2c4@FreeBSD.org> In-Reply-To: <20160822185617.I1897@besplex.bde.org> References: <201608211606.u7LG60pS063983@repo.freebsd.org> <dbb16757-8ddd-0d15-34c1-328a43079c82@selasky.org> <20160822185617.I1897@besplex.bde.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --sDW0aInRvdO9shV324iWNbAq79J5moTFn Content-Type: multipart/mixed; boundary="o6v0Tia18Cj0OXTRIj5IrIa56I8fHek37" From: Bryan Drewery <bdrewery@FreeBSD.org> To: Bruce Evans <brde@optusnet.com.au>, Hans Petter Selasky <hps@selasky.org> Cc: Bruce Evans <bde@freebsd.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <bfe42b05-fb8b-2df7-d829-ba7bf640d2c4@FreeBSD.org> Subject: Re: svn commit: r304567 - head/sys/dev/usb/input References: <201608211606.u7LG60pS063983@repo.freebsd.org> <dbb16757-8ddd-0d15-34c1-328a43079c82@selasky.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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bfe42b05-fb8b-2df7-d829-ba7bf640d2c4>