On 8/23/2016 1:49 PM, Ngie Cooper (yaneurabeya) wrote: > >> On Aug 23, 2016, at 13:38, Bryan Drewery <bdrew...@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 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. > > 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. >
Well yours only supports stable/10+ and not 9- with the older merge style. -- Regards, Bryan Drewery
signature.asc
Description: OpenPGP digital signature
