From owner-svn-doc-head@FreeBSD.ORG Mon Nov 12 18:47:25 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 E1A513FF; Mon, 12 Nov 2012 18:47:25 +0000 (UTC) (envelope-from kaduk@mit.edu) Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU [18.9.25.12]) by mx1.freebsd.org (Postfix) with ESMTP id 4C3968FC08; Mon, 12 Nov 2012 18:47:24 +0000 (UTC) X-AuditID: 1209190c-b7f286d000000ee3-0b-50a14309086e Received: from mailhub-auth-2.mit.edu ( [18.7.62.36]) by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP id ED.47.03811.90341A05; Mon, 12 Nov 2012 13:42:17 -0500 (EST) To: undisclosed-recipients:; Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id qACIgH3J024122; Mon, 12 Nov 2012 13:42:17 -0500 Received: from multics.mit.edu (SYSTEM-LOW-SIPB.MIT.EDU [18.187.2.37]) (authenticated bits=56) (User authenticated as kaduk@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qACIgFmB022697 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 12 Nov 2012 13:42:17 -0500 (EST) Received: (from kaduk@localhost) by multics.mit.edu (8.12.9.20060308) id qACIgELJ000562; Mon, 12 Nov 2012 13:42:14 -0500 (EST) Date: Mon, 12 Nov 2012 13:42:14 -0500 (EST) From: Benjamin Kaduk Subject: Re: svn commit: r39962 - head/en_US.ISO8859-1/articles/committers-guide In-Reply-To: <201211091214.qA9CE021067305@svn.freebsd.org> Message-ID: References: <201211091214.qA9CE021067305@svn.freebsd.org> User-Agent: Alpine 1.10 (GSO 962 2008-03-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpgleLIzCtJLcpLzFFi42IRYrdT0eV0XhhgsGiHscWPj4eYLG4s2s9k sbu/l9mB2WPGp/ksAYxRXDYpqTmZZalF+nYJXBn/XrxgLZhlXPHsWg9rA+MazS5GTg4JAROJ C9s+skHYYhIX7q0Hsrk4hAT2MUpcfj0BLCEiICMxd/ZjVojEBkaJC78mMUE4J5gkzt1uYoRw Ghglzv7oYAVpYRHQlpj69i5YO5uAisTMNxvBbGaBKIk9SxvBaoQFgiQWTDsJFucUsJLoeLQN zOYVcJC4+3UmI4gtJGAp8XrNPhYQW1RAR2L1/iksEDWCEidnPmGBmGkpce7PdbYJjIKzkKRm IUktYGRaxSibklulm5uYmVOcmqxbnJyYl5dapGuol5tZopeaUrqJERSsnJI8OxjfHFQ6xCjA wajEw8vhvCBAiDWxrLgy9xCjJAeTkihvuv3CACG+pPyUyozE4oz4otKc1OJDjBIczEoivL/v ApXzpiRWVqUW5cOkpDlYlMR5L6fc9BcSSE8sSc1OTS1ILYLJynBwKEnwcjsBDRUsSk1PrUjL zClBSDNxcIIM5wEa7gxSw1tckJhbnJkOkT/FaMzx+fXch4wcL7sWPWQUYsnLz0uVEue1ACkV ACnNKM2DmwZLOK8YxYGeE+aVAqniASYruHmvgFYxAa1avw3kj+KSRISUVAOj4E8O9Sey5rN6 BXcer0nXb9Ox0UnQWba/IG0ZO4vwj2vV9Zx8kwWXNrmUpDG9iSzfYDQhOED5/MbdTTEeH84v XT/N8dXql9O616/784Xpqd+r3t8PVGrtbia/yDzUd6Nttvz19VP6pt2cIt2pcCHnk5BbnWem +eNE9Q0lbPELEtt4+gLjZycqsRRnJBpqMRcVJwIA+EK90BMDAAA= Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org, doc-committers@freebsd.org 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: Mon, 12 Nov 2012 18:47:26 -0000 For those wanting more details, http://lists.bestpractical.com/pipermail/svk-devel/2009-May/001224.html seems like a good place to start. -Ben Kaduk On Fri, 9 Nov 2012, Eitan Adler wrote: > 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 - class="directory">~/.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., > - - class="directory">//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 > - - class="directory">/scratch/tmp/peter/.svk/local/ > - with the equivalent of - class="directory">/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 >