From owner-svn-doc-all@FreeBSD.ORG Thu Mar 7 23:37:01 2013 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 0634EF93; Thu, 7 Mar 2013 23:37:01 +0000 (UTC) (envelope-from gavin@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 E7B20AB7; Thu, 7 Mar 2013 23:37:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r27Nb0Gg055459; Thu, 7 Mar 2013 23:37:00 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r27Nb0we055458; Thu, 7 Mar 2013 23:37:00 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201303072337.r27Nb0we055458@svn.freebsd.org> From: Gavin Atkinson Date: Thu, 7 Mar 2013 23:37:00 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r41130 - head/en_US.ISO8859-1/articles/p4-primer X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Mar 2013 23:37:01 -0000 Author: gavin Date: Thu Mar 7 23:37:00 2013 New Revision: 41130 URL: http://svnweb.freebsd.org/changeset/doc/41130 Log: Make a start at bringing the p4-primer up-to-date: Explain how Perforce and Subversion interact. More work is still needed before this fully reflects current reality. Approved by: bcr (mentor) Modified: head/en_US.ISO8859-1/articles/p4-primer/article.xml Modified: head/en_US.ISO8859-1/articles/p4-primer/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/p4-primer/article.xml Thu Mar 7 23:35:09 2013 (r41129) +++ head/en_US.ISO8859-1/articles/p4-primer/article.xml Thu Mar 7 23:37:00 2013 (r41130) @@ -37,7 +37,7 @@ The &os; project uses the Perforce version control system to manage experimental projects that are - not ready for the main CVS repository. + not ready for the main Subversion repository. Availability, Documentation, and Resources @@ -68,9 +68,9 @@ The &os; Perforce server is hosted on perforce.freebsd.org, port 1666. The repository is browsable - online at . + online at . Some portions of the repository are also automatically exported - to a number of CVSup servers. + to a number of legacy CVSup servers. @@ -334,7 +334,8 @@ with &os;. Frequent submits of changes to the server are also encouraged. - The Perforce repository (the + sSimilar to Subversion, the + Perforce repository (the depot) is a single flat tree. Every file, whether a unique creation or a derivative from a branch, is accessible via a simple path under the server - Interactions between &os; CVS and Perforce + Interactions between &os; Subversion and Perforce - The &os; Perforce and CVS - repositories are completely separate. However, changes to CVS are + The &os; Perforce and Subversion + repositories are completely separate. However, changes to Subversion are tracked at near-real-time in Perforce. - Every 2 minutes, the CVS server is polled for updates in the HEAD + Every 2 minutes, the Subversion server is polled for updates in the HEAD branch, and those updates are committed to Perforce in the //depot/vendor/freebsd/... tree. This @@ -822,10 +823,10 @@ should be done so that your tree stays up to date and avoids conflicts with mainline development. - The bridge between CVS and Perforce - is one-way; changes to CVS will be reflected in + The bridge between Subversion and Perforce + is one-way; changes to Subversion will be reflected in Perforce, but changes in Perforce will - not be reflected in CVS. On request, some parts of the + not be reflected in Subversion. On request, some parts of the Perforce repo can be exported to CVSup and made available for distribution that way. Contact the &os;