Date: Tue, 23 Aug 2016 13:57:00 -0700 From: Bryan Drewery <bdrewery@FreeBSD.org> To: "Ngie Cooper (yaneurabeya)" <yaneurabeya@gmail.com> Cc: Bruce Evans <brde@optusnet.com.au>, Hans Petter Selasky <hps@selasky.org>, Bruce Evans <bde@freebsd.org>, src-committers <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: <55444c61-f280-265a-e223-52b128382b71@FreeBSD.org> In-Reply-To: <AFDEC9A1-CC68-4873-8DB8-405A04C9575D@gmail.com> References: <201608211606.u7LG60pS063983@repo.freebsd.org> <dbb16757-8ddd-0d15-34c1-328a43079c82@selasky.org> <20160822185617.I1897@besplex.bde.org> <bfe42b05-fb8b-2df7-d829-ba7bf640d2c4@FreeBSD.org> <AFDEC9A1-CC68-4873-8DB8-405A04C9575D@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --JNqCEshKG4Iv8McndVb1NW1DgNoT0K4vR Content-Type: multipart/mixed; boundary="6VW66JfcqXA1Vv5T2iT6Fpn785i6fDs6V" From: Bryan Drewery <bdrewery@FreeBSD.org> To: "Ngie Cooper (yaneurabeya)" <yaneurabeya@gmail.com> Cc: Bruce Evans <brde@optusnet.com.au>, Hans Petter Selasky <hps@selasky.org>, Bruce Evans <bde@freebsd.org>, src-committers <src-committers@freebsd.org>, 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> <dbb16757-8ddd-0d15-34c1-328a43079c82@selasky.org> <20160822185617.I1897@besplex.bde.org> <bfe42b05-fb8b-2df7-d829-ba7bf640d2c4@FreeBSD.org> <AFDEC9A1-CC68-4873-8DB8-405A04C9575D@gmail.com> In-Reply-To: <AFDEC9A1-CC68-4873-8DB8-405A04C9575D@gmail.com> --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 <bdrewery@FreeBSD.org> 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 <revisions> > # 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?55444c61-f280-265a-e223-52b128382b71>