diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml
index 776044b7c4..6083b9b88e 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.xml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.xml
@@ -1883,37 +1883,20 @@ U stable/9/share/man/man4/netmap.4
Don't remove and re-add the same file in a single commit
as this will break the CVS exporter.
- Speeding up checkouts and minimising network traffic is
- possible with the following recipe:
+ Speeding up svn is
+ possible by adding the following to ~/.ssh/config:
- &prompt.user; svn co --depth=empty svn+ssh://svn.freebsd.org/base fbsvn
-&prompt.user; cd fbsvn
-&prompt.user; svn up --depth=empty stable
-&prompt.user; svn up head
-&prompt.user; cd stable
-&prompt.user; cp -r ../head/ 7
-&prompt.user; cd 7
-&prompt.user; svn switch svn+ssh://svn.freebsd.org/base/stable/7
-&prompt.user; cd ..
-&prompt.user; cp -r 7/ 6
-&prompt.user; cd 6
-&prompt.user; svn switch svn+ssh://svn.freebsd.org/base/stable/6
+ Host *
+ControlPath ~/.ssh/sockets/master-%l-%r@%h:%p
+ControlMaster auto
+ControlPersist yes
- What this bit of evil does is check out head, stable/7 and
- stable/6. We create the empty checkout directories under
- SVN's control. In SVN,
- subtrees are self identifying, like in CVS.
- We check out head and clone it as stable/7. Except we don't
- want the head version so we switch
it to the
- 7.x tree location. SVN downloads diffs to
- convert the head
files to
- stable/7
instead of doing a fresh checkout.
- The same goes for stable/6. This does, however, definitely
- count as abuse of the working copy client code!
+ and then typing
+ mkdir ~/.ssh/sockets
Checking out a working copy with a stock Subversion client
without &os;-specific patches
- (WITH_FREEBSD_TEMPLATE) will mean that
+ (OPTIONS_SET=FREEBSD_TEMPLATE) will mean that
$FreeBSD$ tags will not be
expanded. Once the correct version has been installed, trick
Subversion into expanding them like so:
@@ -1921,8 +1904,7 @@ U stable/9/share/man/man4/netmap.4
&prompt.user; svn propdel -R svn:keywords .
&prompt.user; svn revert -R .
- This is not a good idea if uncommitted patches exist,
- however.
+ This will wipe out uncommitted patches.