From owner-svn-doc-all@FreeBSD.ORG Sun Jun 30 21:24:06 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 B2DE2E4F; Sun, 30 Jun 2013 21:24:06 +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 9570F1C91; Sun, 30 Jun 2013 21:24:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5ULO6HH038701; Sun, 30 Jun 2013 21:24:06 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5ULO6PK038700; Sun, 30 Jun 2013 21:24:06 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201306302124.r5ULO6PK038700@svn.freebsd.org> From: Warren Block Date: Sun, 30 Jun 2013 21:24:06 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r42096 - 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 21:24:06 -0000 Author: wblock Date: Sun Jun 30 21:24:06 2013 New Revision: 42096 URL: http://svnweb.freebsd.org/changeset/doc/42096 Log: Add and unify IDs in SVN Primer. Add note about $FreeBSD$ string for adding new files. Rewrite confusing svn rm explanation. Add explanation to svn cp. Reviewed by: remko, jilles (both only for $FreeBSD$ note) 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 15:08:46 2013 (r42095) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Sun Jun 30 21:24:06 2013 (r42096) @@ -85,7 +85,7 @@ Root svn+ssh://svn.FreeBSD.org/base - (see also ). + (see also ). @@ -93,7 +93,7 @@ Root svn+ssh://svn.FreeBSD.org/doc - (see also ). + (see also ). @@ -101,7 +101,7 @@ Root svn+ssh://svn.FreeBSD.org/ports - (see also ). + (see also ). @@ -389,7 +389,7 @@ There are a few ways to obtain a working copy of the tree from Subversion. This section will explain them. - + Direct Checkout The first is to check out directly from the main @@ -456,7 +456,7 @@ - + Checkout from a Mirror Check out a working copy from a mirror by @@ -482,7 +482,7 @@ information on how to set one up. - + <literal>RELENG_*</literal> Branches and General Layout @@ -542,7 +542,7 @@ - + &os; Documentation Project Branches and Layout @@ -583,7 +583,7 @@ - + &os; Ports Tree Branches and Layout In svn+ssh://svn.freebsd.org/ports, @@ -626,7 +626,7 @@ This section will explain how to perform common day-to-day operations with Subversion. - + Help SVN @@ -640,7 +640,7 @@ Book. - + Checkout As seen earlier, to check out the &os; head @@ -703,7 +703,7 @@ - + Anonymous Checkout It is possible to anonymously check out the &os; @@ -719,7 +719,7 @@ mirror sites. - + Updating the Tree To update a working copy to either the latest revision, @@ -729,7 +729,7 @@ &prompt.user; svn update -r12345 - + Status To view the local changes that have been made to the @@ -743,7 +743,7 @@ &prompt.user; svn status --show-updates - + Editing and Committing Unlike Perforce, @@ -772,7 +772,7 @@ - + Adding and Removing Files @@ -798,13 +798,24 @@ &prompt.user; svn add foo + + Most new source files should include a + $FreeBSD$ string in the + new file. On commit, svn will expand + the $FreeBSD$ 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. + + Files can be removed with svn remove: &prompt.user; svn remove foo - Subversion does not require rming the - file before svn rming it, and indeed + Subversion does not require deleting the + file before using svn rm, and indeed complains if that happens. It is possible to add directories with svn @@ -829,15 +840,20 @@ &prompt.user; svn rm bar - + Copying and Moving Files - The following (obviously) creates a copy of + The command creates a copy of foo.c, named - bar.c: + bar.c, with the new file also under version control: &prompt.user; svn copy foo.c bar.c + svn cp is equivalent to: + + &prompt.user; cp foo.c bar.c +&prompt.user; svn add bar.c + To move and rename a file: &prompt.user; svn move foo.c bar.c @@ -848,7 +864,7 @@ &prompt.user; svn remove foo.c - + Log and Annotate svn log will show all the @@ -865,7 +881,7 @@ but output format. - + Diffs svn diff displays changes to the @@ -888,7 +904,7 @@ &prompt.user; svn diff -c179454 . - + Reverting Local changes (including additions and deletions) can be @@ -898,7 +914,7 @@ the original version. - + Conflicts If a svn update resulted in a merge @@ -950,7 +966,7 @@ Advanced Use - + Sparse Checkouts The equivalent to cvs checkout -l, @@ -1019,7 +1035,7 @@ &prompt.user; svn update --set-depth=infinity head - + Direct Operation Certain operations can be performed directly on the @@ -1069,7 +1085,7 @@ &prompt.user; svn commit stable/8 - + Merging with <acronym>SVN</acronym> This section deals with merging code from one branch to @@ -1385,12 +1401,12 @@ $target - head/$source:$P,$Q,$R in r238987 is to be merged from CURRENT to 9-STABLE. The file resides in head/share/man/man4 and - according to + according to this is also where to do the merge. Note that in this example all paths are relative to the top of the svn repository. For more information on the directory layout, see - . + . The first step is to inspect the existing mergeinfo. @@ -1467,7 +1483,7 @@ U stable/9/share/man/man4/netmap.4 - + Vendor Imports with <acronym>SVN</acronym> @@ -1781,7 +1797,7 @@ U stable/9/share/man/man4/netmap.4 - + Reverting a Commit Reverting a commit to a previous version is fairly @@ -1824,7 +1840,7 @@ U stable/9/share/man/man4/netmap.4 cause history to be lost. - + Fixing Mistakes While we can do surgery in an emergency, do not plan on @@ -1850,7 +1866,7 @@ U stable/9/share/man/man4/netmap.4 This is a waste. - + Setting up a <application>svnsync</application> Mirror @@ -1895,7 +1911,7 @@ U stable/9/share/man/man4/netmap.4 Use propset to change things. - + Committing High-<acronym>ASCII</acronym> Data Files that have high-ASCII bits are @@ -1913,7 +1929,7 @@ U stable/9/share/man/man4/netmap.4 &prompt.user; svn propset fbsd:notbinary yes foo.data - + Maintaining a Project Branch A project branch is one that is synced to head (or @@ -2034,7 +2050,7 @@ ControlPersist yes svn:keywords property will be rejected when attempting to commit them to the repository. Be sure to read - regarding + regarding adding and removing files, in addition to verifying that ~/.subversion/config contains the necessary "auto-props" entries from