From owner-svn-doc-head@FreeBSD.ORG Fri Nov 9 12:14:00 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 A471EE5B; Fri, 9 Nov 2012 12:14:00 +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 886E48FC0A; Fri, 9 Nov 2012 12:14:00 +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 qA9CE0kZ067307; Fri, 9 Nov 2012 12:14:00 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA9CE021067305; Fri, 9 Nov 2012 12:14:00 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201211091214.qA9CE021067305@svn.freebsd.org> From: Eitan Adler Date: Fri, 9 Nov 2012 12:14:00 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r39962 - 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, 09 Nov 2012 12:14:00 -0000 Author: eadler Date: Fri Nov 9 12:14:00 2012 New Revision: 39962 URL: http://svnweb.freebsd.org/changeset/doc/39962 Log: SVK is no longer actively developed. Approved by: jkois (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 Nov 9 10:06:11 2012 (r39961) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Fri Nov 9 12:14:00 2012 (r39962) @@ -370,7 +370,7 @@ Getting Started - There are three ways to obtain a working copy of the tree + There are a few ways to obtain a working copy of the tree from Subversion. This section will explain them. @@ -466,119 +466,6 @@ information on how to set one up. - - Checkout from a Local Mirror Using - <acronym>SVK</acronym> - - The third alternative is to use SVK - to maintain a local mirror. It is a version control system - build on top of Subversion's storage engine. It is - identical to Subversion in most respects, except that it - allows for setting up parts of repositories as mirrors of - other repositories, and keeping local branches for merging - back into the upstream repositories. There are extensions - that allow SVK to mirror - Perforce repositories in addition - to Subversion ones. - - Like everything, SVK has its - disadvantages, one being that local revision numbers will - not match upstream revision numbers. This makes it - difficult to svk log, svk - diff, or svk update to an - arbitrary upstream revision. - - To set up a mirror of the &os; repository, do: - - &prompt.user; svk mirror svn+ssh://svn.freebsd.org/base //freebsd/base - - The local SVK repository will be - stored in ~/.svk/local/, but can be - moved to an alternate location. If it is moved, - ~/.svk/config should be amended - manually to reflect the move. - - Any path can be used, not just the one in the example - above. A common pattern is to place mirrors under - //mirror, e.g., - //mirror/freebsd/base/, and - local branches under //local. - - To pull down the contents of the repository to the - mirror: - - &prompt.user; svk sync //freebsd/base - - - svk sync will take a very long - time, possibly several days over a slow network - connection. &a.peter; has a tarball that can be used to - jumpstart the mirror, but only if one does not exist - already. - - - To use the tarball referenced above: - - &prompt.user; cd ~ -&prompt.user; scp freefall:/home/peter/dot_svk_r179646.tbz2 . -&prompt.user; tar xf dot_svk_r179646.tbz2 - - Then edit ~/.svk/config and replace - /scratch/tmp/peter/.svk/local/ - with the equivalent of /home/jarjar/.svk/local/. - - You can check out files directly from your mirror, once - it has been created: - - &prompt.user; svk checkout //freebsd/base/head /usr/src - - Unlike SVN, SVK - does not store metadata or reference copies in the working - copy. All metadata is recorded in - ~/.svk/config; reference copies are not - used at all because SVK always operates - on a local repository. - - When committing from a working copy like the one above, - SVN will commit directly to the upstream - repository, then synchronise the mirror. - - However, the killer app for - SVK is the ability to work without a - network connection. To do that, a local branch must be set - up: - - &prompt.user; svk mkdir //local/freebsd -&prompt.user; svk copy //freebsd/base/head //local/freebsd/head - - Once again, any path can be used, it does not have to - specifically be the one in the example. - - Before use, the local branch has to be synchronized, - like so: - - &prompt.user; svk pull //local/freebsd/head - - Then check out from the newly created local - branch: - - &prompt.user; svk checkout //local/freebsd/head /usr/src - - The point of this exercise is showing that it is - possible to commit work-in-progress to a local branch, and - only push it to the upstream repository when work is - complete. The easy way to push is with svk - push, but there is a serious disadvantage to it: - it will push every single commit made to the local branch - incrementally instead of lumping them all into a single - commit. Therefore, using svk smerge is - preferable. - - <literal>RELENG_*</literal> Branches and General Layout