From owner-p4-projects@FreeBSD.ORG Fri Mar 27 15:44:16 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A97A21065673; Fri, 27 Mar 2009 15:44:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 67A5C106566B for ; Fri, 27 Mar 2009 15:44:15 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 553568FC1B for ; Fri, 27 Mar 2009 15:44:15 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2RFiF0L006165 for ; Fri, 27 Mar 2009 15:44:15 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2RFiFJB006163 for perforce@freebsd.org; Fri, 27 Mar 2009 15:44:15 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 27 Mar 2009 15:44:15 GMT Message-Id: <200903271544.n2RFiFJB006163@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 159910 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2009 15:44:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=159910 Change 159910 by rene@rene_self on 2009/03/27 15:44:12 Committers guide: * link to svn book at red-bean.com * mark vcs as replaceable in command tags * language nits Submitted by: trhodes,gabor Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#20 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#20 (text+ko) ==== @@ -240,15 +240,15 @@ It is assumed that you are already familiar with the basic operation of the version control systems in use. Traditionally this was - CVS, but as of June 2008 Subversion is used for the src tree. The + CVS, but as of June 2008, Subversion is used for the src tree. The generic term VCS (or none at all) will be used unless the text is specific to CVS or SVN. The &a.cvsadm; are the owners of the repository and are responsible for direct modification of it for the purposes of - cleanup or fixing some grievous abuse of VCS by a committer. - Should you cause some repository accident, say a bad vcs - import or vcs tag operation, mail the + cleanup or fixing some unfortunate abuse of VCS by a committer. + Should you cause some repository accident, say a bad + import or tag creation, mail the responsible part of &a.cvsadm;, as stated in the table below, (or call one of them) and report the problem. For very important issues affecting the entire tree—not @@ -287,7 +287,7 @@ combined under a single CVSROOT when distributed via CVSup for the convenience of our users. The src tree is automatically exported to - CVSup. + CVS. Note that the www module containing sources for the FreeBSD website is @@ -848,7 +848,8 @@ things missing in Subversion when compared to CVS. The notes at - might also be useful. + might also be useful. Subversion is also described in-depth + in Version Control with Subversion. @@ -904,13 +905,13 @@ review your diffs, using - cvs diff + vcs diff Also, ALWAYS specify which files to commit explicitly on the command line, so you do not accidentally commit other files - than the ones you intended - vcs commit + than the ones you intended - vcs commit without any arguments will commit every modification in your current working directory and every subdirectory. @@ -1288,7 +1289,7 @@ listed MAINTAINER in the Makefile. For other parts of the repository, if you are unsure who the active maintainer might - be, it may help to scan the output of vcs log + be, it may help to scan the output of vcs log to see who has committed changes in the past. &a.fenner; has written a nice shell script that can help determine who the active maintainer might be. It lists each person who has @@ -2221,7 +2222,7 @@ Do not mix style fixes with new functionality. A style fix is any change which does not modify the functionality of the code. Mixing the changes obfuscates the functionality - change when using vcs diff, which can hide + change when using vcs diff, which can hide any new bugs. Do not include whitespace changes with content changes in commits to doc/ or www/. The extra clutter in the diffs @@ -3319,7 +3320,7 @@ To add a file onto a branch, simply checkout or update to the branch you want to add to and then add the file using - vcs add as you normally would. This works + vcs add as you normally would. This works fine for the doc and ports trees. The src tree uses SVN and requires more care because of the