From owner-svn-doc-head@FreeBSD.ORG Tue Oct 2 19:46:33 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 3AE6E106564A; Tue, 2 Oct 2012 19:46:33 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1AF008FC0C; Tue, 2 Oct 2012 19:46:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q92JkWcv094772; Tue, 2 Oct 2012 19:46:32 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q92JkWl1094770; Tue, 2 Oct 2012 19:46:32 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201210021946.q92JkWl1094770@svn.freebsd.org> From: Eitan Adler Date: Tue, 2 Oct 2012 19:46:32 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r39641 - head/en_US.ISO8859-1/articles/committers-guide X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.5 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: Tue, 02 Oct 2012 19:46:33 -0000 Author: eadler (src,ports committer) Date: Tue Oct 2 19:46:32 2012 New Revision: 39641 URL: http://svn.freebsd.org/changeset/doc/39641 Log: Reduce the presence of CVS in the committers guide. Comparisons with CVS are not needed anymore. Approved by: bcr 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 Tue Oct 2 18:26:44 2012 (r39640) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Tue Oct 2 19:46:32 2012 (r39641) @@ -478,7 +478,7 @@ other repositories, and keeping local branches for merging back into the upstream repositories. There are extensions that allow SVK to mirror - CVS and Perforce repositories in addition + Perforce repositories in addition to Subversion ones. Like everything, SVK has its @@ -711,16 +711,6 @@ daily use, except for the revision renumbering mentioned earlier. - - SVN and SVK - commands that have direct CVS equivalents - usually have the same name and abbreviations. For example: - checkout and co, - update and up, and - commit and - ci. - - Help @@ -824,11 +814,7 @@ &prompt.user; svn status - CVS has no direct equivalent of this - command. The nearest would be cvs up -N - which shows local changes and files that are out-of-date. - Doing this in SVN is possible too, - however: + To show local changes and files that are out-of-date do: &prompt.user; svn status --show-updates @@ -836,7 +822,7 @@ Editing and Committing - Like CVS but unlike Perforce, + Unlike Perforce, SVN and SVK do not need to be told in advance about file editing. @@ -882,7 +868,7 @@ - As with CVS, files are added to a + Files are added to a SVN repository with svn add. To add a file named foo, edit it, then: @@ -910,10 +896,9 @@ &prompt.user; svn mkdir bar - In CVS, the directory is immediately - created in the repository when you cvs - add it; this is not the case in Subversion. - Furthermore, unlike CVS, Subversion + The directory is not immediately + created in the repository when you use svn + mkdir. Subversion allows directories to be removed using svn rm, however there is no svn rmdir: @@ -938,9 +923,6 @@ &prompt.user; svn copy foo.c bar.c &prompt.user; svn remove foo.c - - Neither of these operations have equivalents in - CVS. @@ -965,11 +947,11 @@ 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 + SVN are unified + and include new files by default in the diff output. - As with CVS, svn + svn diff can show the changes between two revisions of the same file: @@ -987,8 +969,8 @@ Reverting Local changes (including additions and deletions) can be - reverted using svn revert. Unlike - cvs up -C, it does not update out-of-date + reverted using svn revert. + It does not update out-of-date files—it just replaces them with pristine copies of the original version. @@ -1877,8 +1859,8 @@ U stable/9/share/man/man4/netmap.4 of svn status and svn diff before committing. - Mistakes will happen, but, unlike with - CVS, they can generally be fixed without + Mistakes will happen but, + they can generally be fixed without disruption. Take a case of adding a file in the wrong location. The