From owner-svn-doc-all@FreeBSD.ORG Sun Jun 30 23:11:05 2013 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 98876FD2; Sun, 30 Jun 2013 23:11:05 +0000 (UTC) (envelope-from wblock@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 795B11F2D; Sun, 30 Jun 2013 23:11:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5UNB59L070365; Sun, 30 Jun 2013 23:11:05 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5UNB5wi070364; Sun, 30 Jun 2013 23:11:05 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201306302311.r5UNB5wi070364@svn.freebsd.org> From: Warren Block Date: Sun, 30 Jun 2013 23:11:05 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r42100 - head/en_US.ISO8859-1/articles/committers-guide 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: Sun, 30 Jun 2013 23:11:05 -0000 Author: wblock Date: Sun Jun 30 23:11:05 2013 New Revision: 42100 URL: http://svnweb.freebsd.org/changeset/doc/42100 Log: Change 'svn switch --relocate' to 'svn relocate'. Use &os; in reference to $FreeBSD$ version string. Rewrite some sections that had defined svn operations in terms of what CVS did so they can stand alone. Remove confusing reference to 'svn rmdir', which does not, in fact, actually exist. 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 Sun Jun 30 23:00:47 2013 (r42099) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Sun Jun 30 23:11:05 2013 (r42100) @@ -466,11 +466,11 @@ using svnsync. There is a serious disadvantage to this method: every - time something is to be committed, a svn switch - --relocate to the master repository has to be - done, remembering to svn switch back to + time something is to be committed, a + svn relocate to the master repository has to be + done, remembering to svn relocate back to the mirror after the commit. Also, since svn - switch only works between repositories that have + relocate only works between repositories that have the same UUID, some hacking of the local repository's UUID has to occur before it is possible to start using it. @@ -800,13 +800,13 @@ Most new source files should include a - $FreeBSD$ string in the + $&os;$ string in the new file. On commit, svn will expand - the $FreeBSD$ string, + the $&os;$ string, adding the file path, revision number, date and time of commit, and the username of the committer. Files which cannot be modified may be committed without the - $FreeBSD$ string. + $&os;$ string. Files can be removed with svn @@ -830,12 +830,9 @@ &prompt.user; svn mkdir bar - 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: + Like files, directories are removed with + svn rm. There is no separate command + specifically for removing directories. &prompt.user; svn rm bar @@ -843,13 +840,13 @@ Copying and Moving Files - The command creates a copy of - foo.c, named + This command creates a copy of + foo.c named bar.c, with the new file also under version control: &prompt.user; svn copy foo.c bar.c - svn cp is equivalent to: + The example above is equivalent to: &prompt.user; cp foo.c bar.c &prompt.user; svn add bar.c @@ -862,25 +859,22 @@ Log and Annotate - svn log will show all the - revisions that affect a directory and files within that - directory in reverse chronological order, if run on a - directory. This contrasts with cvs log - in that CVS shows the complete log for - each file in the directory, including duplicate entries for - revisions that affect multiple files. + svn log shows revisions and + commit messages, most recent first, for files or directories. When used on a directory, all + revisions that affected the directory and files within that + directory are shown. svn annotate, or equally svn - praise or svn blame, is - equivalent to cvs annotate in everything - but output format. + praise or svn blame, shows + the most recent revision number and who committed that + revision for each line of a file. Diffs svn diff displays changes to the - working copy of the repository. Diffs generated by + working copy. Diffs generated by SVN are unified and include new files by default in the diff output. @@ -905,14 +899,14 @@ Local changes (including additions and deletions) can be reverted using svn revert. It does not update out-of-date - files—it just replaces them with pristine copies of + files, but just replaces them with pristine copies of the original version. Conflicts - If a svn update resulted in a merge + If an svn update resulted in a merge conflict, Subversion will remember which files have conflicts and refuse to commit any changes to those files until explicitly told that the conflicts have been resolved. @@ -964,24 +958,12 @@ Sparse Checkouts - The equivalent to cvs checkout -l, - which checks out a directory without its subdirectories, is - svn checkout -N. Unlike - CVS, SVN remembers the - -N so that a svn - update does not end up pulling down the - subdirectories. In Subversion 1.5 and newer, - -N has been deprecated in favour of the - --depth option which allows for precise - control. Therefore: + SVN allows + sparse, or partial checkouts of a + directory by adding to a + svn checkout. - &prompt.user; svn checkout -N svn+ssh://svn.freebsd.org/base ~/freebsd - - is equivalent to: - - &prompt.user; svn checkout --depth=empty svn+ssh://svn.freebsd.org/base ~/freebsd - - Valid arguments to --depth + Valid arguments to are: @@ -1024,7 +1006,7 @@ ROADMAP.txt and empty subdirectories, and nothing will happen when svn update is executed on the subdirectories. However, the following - command will set the depth for head (in this case) to + command will set the depth for head (in this case) to infinity, and fully populate it: &prompt.user; svn update --set-depth=infinity head @@ -1034,7 +1016,7 @@ Direct Operation Certain operations can be performed directly on the - repository, without touching the working copy. + repository without touching the working copy. Specifically, this applies to any operation that does not require editing a file, including: