> On Thu, 15 Mar 2018, Rodney W. Grimes wrote: > > >> On 15/03/2018 10:30, Eitan Adler wrote: > >>> ... > >>> Log: > >>> MFC > >>> r303063,r311852,r311930,r317040,r320506,r321301,r325162,r326759,r329004,: > >> I have never seen things like these MFC-ed before... > >> Should we be really doing them? > > > > Yes, imho. And the reasons may seem odd to sum, but here is my spin on > > this: > > ... > > Maybe we should even add to the end of the commiters "these are the > > things you should do as a new committer" the merging of your info > > into to all supported/active releases. Which is a good opportunity > > for teaching how to do svn sparse checkouts as you really do not > > want to pull all of stable/10 out just to commit to 1 file. > > Actually, it is necessary to check out everything to MFC to 1 file. > Sparse checkouts only work for committing to head. They break mergeinfo > for MFCs. Or so I was told when I MFCed with a sparse checkout. This is > my excuse for not MFC'ing anything.
The procedure for a branch is harder, you can do sparse, you just have to do the tree one level at a time in sparse mode until you get to the leaf you want to commit at. Then you do the merge at the top of the sparse tree, then commit: (Recent example done to help someone with there first MFC:) #!/bin/sh mkdir ~/svnwork.r328011 cd ~/svnwork.r328011 svn checkout svn+ssh://repo.freebsd.org/base --depth immediates cd base/stable && svn update --set-depth=immediates cd 11 && svn update --set-depth=immediates cd sys && svn update --set-depth=immediates cd amd64 && svn update --set-depth=infinity cd ~/svnwork.r328011/base/stable/11 svn merge -c r328011,r329162 ^/head svn diff >~/svnwork.r328011/diff.OUT You now no longer have that excuse :-) -- Rod Grimes rgri...@freebsd.org _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
