From owner-svn-doc-head@FreeBSD.ORG Fri Dec 7 13:00:47 2012 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 818EE4EE; Fri, 7 Dec 2012 13:00:47 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5CC3A8FC17; Fri, 7 Dec 2012 13:00:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB7D0lH4098935; Fri, 7 Dec 2012 13:00:47 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB7D0l2W098934; Fri, 7 Dec 2012 13:00:47 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201212071300.qB7D0l2W098934@svn.freebsd.org> From: Eitan Adler Date: Fri, 7 Dec 2012 13:00:47 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r40292 - head/en_US.ISO8859-1/articles/committers-guide X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Dec 2012 13:00:47 -0000 Author: eadler Date: Fri Dec 7 13:00:46 2012 New Revision: 40292 URL: http://svnweb.freebsd.org/changeset/doc/40292 Log: The "svn switch" tip isn't needed anymore, but the ControlMaster tip can help with TCP latency. While here: modernize the makefile options and clarify the text Approved by: bcr (mentor) Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/committers-guide/article.xml Fri Dec 7 13:00:44 2012 (r40291) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Fri Dec 7 13:00:46 2012 (r40292) @@ -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 - - 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! + Host * +ControlPath ~/.ssh/sockets/master-%l-%r@%h:%p +ControlMaster auto +ControlPersist yes + + 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.