Date: Tue, 23 Aug 2016 13:49:54 -0700 From: "Ngie Cooper (yaneurabeya)" <yaneurabeya@gmail.com> To: Bryan Drewery <bdrewery@FreeBSD.org> 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: <AFDEC9A1-CC68-4873-8DB8-405A04C9575D@gmail.com> In-Reply-To: <bfe42b05-fb8b-2df7-d829-ba7bf640d2c4@FreeBSD.org> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] > On Aug 23, 2016, at 13:38, Bryan Drewery <bdrewery@FreeBSD.org> wrote: … > 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. I have one that I noted a while back — it’s a bit less featureful, but it works pretty well IMHO: 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 Example usage: ~/mfc ^/head <revisions> # Do whatever you need to make sure that the commit is ok. svn ci -F commit The only thing it fubars is some of the spacing with some of the commit messages (I don’t remember if it was with my commits being MFCed or other’s commits being MFCed). I’m a bit pedantic about formatting -- that’s the only reason why I haven’t posted it up earlier as an official solution for others to use. Cheers, -Ngie [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJXvLbzAAoJEPWDqSZpMIYVwpMP/3AgNLsHeYKpKr4vGruE9C98 6+codrzWWib1xFe41MEXYCX1VENo20I6f1DrfZzyIuX14zZK3QfBZdV7jkT2jNcE RtEpRlGbEngCdH/MQ9eHCRarInoZviYCRNGHPgBKJyov7Ne9pn+b3aeNpEdcvdek OBflKWPE7eHLlwujX5zEtcIDUHu2WBEvcR6tn4q2Kv1Xg0dTw+t3JjDOsiI0e/xf /86zbxvdefoO5kkIpkyYqNyzc6bUl5WM/FKo34s6iskWUpdsyp72iZgvpACjnif+ DfqmguyMXhUpvwu47t7aqOxLgyK9YCOq/tI21cnByvhnoIltNQ3y+rqg1qLz1vEk 57RRU16trFHUZhap0z/jBV2qPkhgEGflo4vaNQPd+XLMRw5svkoSo6/gNShghDEj zlBuasgowpKV/nZ1xCEiEjEoBEoPMZeTacXM5uWDQQl2j/IADAjhwdvDuiwxTEbu 0NWRHFRAXlqItNIwDPccsqtKZJWd07fKSg1/5Uz+xgHzw6vQvIYGIqkYF8UVEXY6 nc5BzxlvafKi/5tKRg75Ydt5F3StvaX9Cd/ADuFdH97y7il2Z61SDXCbtZC7+HvM jqGx3+qz3cMz0nQr9IBIXGVHKOGAy8L4PUk/L0WxSacsyibCAfdA0mjaahlT5tYm LvCXBDZji/wX/W0ba7VQ =tDi+ -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AFDEC9A1-CC68-4873-8DB8-405A04C9575D>