diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml index 488714e38d..96c2791735 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.xml +++ b/en_US.ISO8859-1/articles/committers-guide/article.xml @@ -580,35 +580,6 @@ You need a Passphrase to protect your secret key. - - Checkout from a Mirror - - Check out a working copy from a mirror by - substituting the mirror's URL for - svn+ssh://repo.freebsd.org/base. This - can be an official mirror or a mirror maintained by using - svnsync. - - There is a serious disadvantage to this method: every - time something is to be committed, a - svn relocate to the master repository has - to be done, remembering to svn relocate - back to the mirror after the commit. Also, since - svn relocate only works between - repositories that have the same UUID, some hacking of the - local repository's UUID has to occur before it is possible - to start using it. - - The hassle of a local svnsync mirror - probably is not worth it unless the network connectivity - situation or other factors demand it. Starting - a fresh mirror from empty takes a long time. - Expect a minimum of 10 hours with high speed connectivity. - If international links are involved, expect this to take - four to ten times longer. Another option is to use the - git mirror. - - <literal>RELENG_*</literal> Branches and General Layout @@ -1863,6 +1834,69 @@ U stable/9/share/man/man4/netmap.4 This is a waste. + + Using a Subversion mirror + + There is a serious disadvantage to this method: every + time something is to be committed, a + svn relocate to the master repository has + to be done, remembering to svn relocate + back to the mirror after the commit. Also, since + svn relocate only works between + repositories that have the same UUID, some hacking of the + local repository's UUID has to occur before it is possible + to start using it. + + + Checkout From a Mirror + + Check out a working copy from a mirror by + substituting the mirror's URL for + svn+ssh://repo.freebsd.org/base. This + can be an official mirror or a mirror maintained by using + svnsync. + + + + Setting up a <application>svnsync</application> + Mirror + + Avoid setting up a svnsync + mirror unless there is a very good reason for it. Most + of the time a git mirror is a better + alternative. Starting a fresh mirror from scratch takes + a long time. + Expect a minimum of 10 hours for high speed connectivity. + If international links are involved, expect this to take + four to ten times longer. + + One way to limit the time required is to grab a seed file. + It is large + (~1GB) but will consume less network traffic and take less + time to fetch than svnsync will. + + Extract the file and update it: + + &prompt.user; tar xf svnmirror-base-r261170.tar.xz +&prompt.user; svnsync sync file:///home/svnmirror/base + + Now, set that up to run from &man.cron.8;, do + checkouts locally, set up a svnserve server for local + machines to talk to, etc. + + The seed mirror is set to fetch from + svn://svn.freebsd.org/base. The + configuration for the mirror is stored in + revprop 0 on the local mirror. To see + the configuration, try: + + &prompt.user; svn proplist -v --revprop -r 0 file:///home/svnmirror/base + + Use svn propset to change things. + + + Committing High-<acronym>ASCII</acronym> Data