From owner-p4-projects@FreeBSD.ORG Sun Mar 11 18:36:01 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B1FD1065673; Sun, 11 Mar 2012 18:36:01 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3F08D106566C for ; Sun, 11 Mar 2012 18:36:01 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 27B998FC12 for ; Sun, 11 Mar 2012 18:36:01 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q2BIa05O045323 for ; Sun, 11 Mar 2012 18:36:00 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q2BIa0YP045320 for perforce@freebsd.org; Sun, 11 Mar 2012 18:36:00 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 11 Mar 2012 18:36:00 GMT Message-Id: <201203111836.q2BIa0YP045320@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 207807 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Mar 2012 18:36:01 -0000 http://p4web.freebsd.org/@@207807?ac=10 Change 207807 by rene@rene_acer on 2012/03/11 18:35:06 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#50 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#130 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#50 (text+ko) ==== @@ -9,7 +9,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.311 2012/02/24 14:10:05 gjb Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.313 2012/03/11 15:32:12 gjb Exp $ 1999 @@ -131,6 +131,7 @@ stable/7 (7.X-STABLE), stable/8 (8.X-STABLE), + stable/9 (9.X-STABLE), head (-CURRENT) @@ -856,10 +857,9 @@ The following are some Subversion examples related to the - src repository. More (in-depth) information can be found at - Subversion - Primer and + and List of things missing in Subversion when compared to CVS. The notes at The local SVK repository will be stored in ~/.svk/local/, but can be - moved to whereever suits. If it is moved, + moved to an alternate location. If it is moved, ~/.svk/config should be amended manually to reflect the move. @@ -1245,8 +1245,7 @@ already. - To use &a.peter;'s tarball mentioned in the note - above: + To use the tarball referenced above: &prompt.user; cd ~ &prompt.user; scp freefall:/home/peter/dot_svk_r179646.tbz2 . @@ -1443,8 +1442,10 @@ stable/7; it will not pull down the whole tree. - It is useful to note that decreasing the depth of a - working copy is not possible. + + Decreasing the depth of a working copy is not + possible. + @@ -1493,13 +1494,13 @@ SVN and SVK do not need to be told in advance about file editing. - svn commitworks like the equivalent + svn commit works like the equivalent CVS command. To commit all changes in the current directory and all subdirectories: &prompt.user; svn commit - To commit all changes in, for example, the To commit all changes in, for example, lib/libfetch/ and usr/bin/fetch/ @@ -1605,13 +1606,13 @@ Diffs - The svn diff displays changes to the - working copy of the repository. SVN's - diffs are unified by default, unlike - CVS's, and SVN's - include new files by default in the diff output. + svn diff displays changes to the + working copy of the repository. Diffs generated by + SVN are unified by default, unlike + CVS, and include new files by default + in the diff output. - Like cvs diff, svn + As with CVS, svn diff can show the changes between two revisions of the same file: ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#130 (text+ko) ==== @@ -1,4 +1,4 @@ - +