On 8/22/2016 1:59 AM, Bruce Evans wrote: > On Sun, 21 Aug 2016, Hans Petter Selasky wrote: > >> 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. > > 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. > > Bruce >
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 r...@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. -- Regards, Bryan Drewery
signature.asc
Description: OpenPGP digital signature
