Index: subversion/doc/book/book/ch09.xml =================================================================== --- subversion/doc/book/book/ch09.xml (revision 9114) +++ subversion/doc/book/book/ch09.xml (working copy) @@ -228,7 +228,7 @@ ARG - Uses ARG as the newer target. + Uses ARG as the newer target. @@ -306,7 +306,7 @@ ARG - Uses ARG as the older target. + Uses ARG as the older target. @@ -885,7 +885,7 @@ Examples Well, there's not much to the examples here as svn - cleanup generates no output. If you pass no PATH, '.' + cleanup generates no output. If you pass no PATH, . is used. @@ -974,7 +974,7 @@ Commit a simple modification to a file with the commit message on the command line and an implicit - target of your current directory (.): + target of your current directory (.): $ svn commit -m "added howto section." @@ -1040,7 +1040,7 @@ Description Copy a file in a working copy or in the repository. - SRC and DST can each be either a working copy + SRC and DST can each be either a working copy (WC) path or URL: @@ -1167,7 +1167,7 @@ - This is the easiest way to 'tag' a revision in + This is the easiest way to tag a revision in your repository—just svn copy that revision (usually HEAD) into your tags directory. @@ -1204,7 +1204,7 @@ Description - Items specified by PATH are scheduled + Items specified by PATH are scheduled for deletion upon the next commit. Files (and directories that have not been committed) are immediately removed from the working copy. The command @@ -1310,13 +1310,13 @@ Description Display the differences between two paths. Each - TARGET can be either a working copy path or URL. If no - TARGET is specified, a value of '.' is assumed. + TARGET can be either a working copy path or URL. If no + TARGET is specified, a value of . is assumed. - If TARGET is a URL, then revs N and M must be given + If TARGET is a URL, then revs N and M must be given via the . - If TARGET is a working copy path, then the + If TARGET is a working copy path, then the switch means: @@ -1324,14 +1324,14 @@ --revision N:M - The server compares TARGET@N and TARGET@M. + The server compares TARGET@ and TARGET@M. --revision N - The client compares TARGET@N against working copy. + The client compares TARGET@N against working copy. @@ -1339,15 +1339,15 @@ (no --revision) The client compares base and working copies of - TARGET. + TARGET. If the alternate syntax is used, the server compares - URL1 and URL2 at revisions N and M respectively. If - either N or M are omitted, a value of HEAD is + URL1 and URL2 at revisions N and M respectively. If + either N or M are omitted, a value of HEAD is assumed. By default, svn diff ignores the @@ -1422,7 +1422,7 @@ +++ COMMITTERS (working copy) - Compare revision 3000 to revision 3500 using '@' + Compare revision 3000 to revision 3500 using @ syntax: @@ -1490,12 +1490,12 @@ The first form exports a clean directory tree from the repository specified by URL, at revision REV if it - is given, otherwise at HEAD, into PATH. If PATH is + is given, otherwise at HEAD, into PATH. If PATH is omitted, the last component of the URL is used for the local directory name. The second form exports a clean directory tree from - the working copy specified by PATH1 into PATH2. All + the working copy specified by PATH1 into PATH2. All local changes will be preserved, but files not under version control will not be copied. @@ -1610,9 +1610,9 @@ Description - Recursively commit a copy of PATH - to URL. If PATH - is omitted '.' is assumed. Parent directories are created + Recursively commit a copy of PATH + to URL. If PATH + is omitted . is assumed. Parent directories are created in the repository as necessary. @@ -1655,7 +1655,7 @@ Examples - This imports the local directory 'myproj' into the + This imports the local directory myproj into the root of your repository: @@ -1666,9 +1666,9 @@ Committed revision 16. - This imports the local directory 'myproj' into - 'trunk/vendors' in your repository. The directory - 'trunk/vendors' need not exist before you import into + This imports the local directory myproj into + trunk/vendors in your repository. The directory + trunk/vendors need not exist before you import into it—svn import will recursively create directories for you: @@ -1792,11 +1792,11 @@ Description - List each TARGET file and the contents of each TARGET - directory as they exist in the repository. If TARGET is a + List each TARGET file and the contents of each TARGET + directory as they exist in the repository. If TARGET is a working copy path, the corresponding repository URL will be used. - The default TARGET is '.', meaning the repository URL + The default TARGET is ., meaning the repository URL of the current working copy directory. With , the following fields show the status of the item: @@ -1891,13 +1891,13 @@ working directory of your working copy. You can refine the results by specifying a path, one or more revisions, or any combination of the two. - The default revision range for a local path is BASE:1. + The default revision range for a local path is BASE:1. If you specify a URL alone, then it prints log messages for everything that the URL contains. If you add paths past the URL, only messages for those paths under that URL will be printed. The default revision range - for a URL is HEAD:1. + for a URL is HEAD:1. With , svn log will also print all affected paths with each log message. @@ -1908,7 +1908,7 @@ Each log message is printed just once, even if more than one of the affected paths for that revision were explicitly requested. Logs follow copy history by - default. Use --stop-on-copy to disable this behavior, + default. Use to disable this behavior, which can be useful for determining branch points. @@ -2044,9 +2044,9 @@ this: -$ svn log -r 14 > mylog -$ svn log -r 19 >> mylog -$ svn log -r 27 >> mylog +$ svn log -r 14 > mylog +$ svn log -r 19 >> mylog +$ svn log -r 27 >> mylog $ cat mylog ------------------------------------------------------------------------ r14 | ... @@ -2067,9 +2067,9 @@ -$ svn log --incremental -r 14 > mylog -$ svn log --incremental -r 19 >> mylog -$ svn log --incremental -r 27 >> mylog +$ svn log --incremental -r 14 > mylog +$ svn log --incremental -r 19 >> mylog +$ svn log --incremental -r 27 >> mylog $ cat mylog ------------------------------------------------------------------------ r14 | ... @@ -2130,18 +2130,18 @@ Description In the first form, the source URLs are specified - at revisions N and M. These are the two sources to be + at revisions N and M. These are the two sources to be compared. The revisions default to HEAD if omitted. - In the second form, SOURCE can be a URL or working + In the second form, SOURCE can be a URL or working copy item, in which case the corresponding URL is used. - This URL, at revisions N and M, defines the two sources + This URL, at revisions N and M, defines the two sources to be compared. - WCPATH is the working copy path that will receive - the changes. If WCPATH is omitted, a default value of - '.' is assumed, unless the sources have identical - basenames that match a file within '.': in which case, + WCPATH is the working copy path that will receive + the changes. If WCPATH is omitted, a default value of + . is assumed, unless the sources have identical + basenames that match a file within .: in which case, the differences will be applied to that file. Unlike svn diff, the merge command @@ -2237,7 +2237,7 @@ Description Create a directory with a name given by the final component - of the PATH or URL. A directory specified by a working copy PATH + of the PATH or URL. A directory specified by a working copy PATH is scheduled for addition in the working copy. A directory specified by a URL is created in the repository via an immediate commit. Multiple directory @@ -2722,7 +2722,7 @@ Description - Set PROPNAME to PROPVAL on files, directories, or + Set PROPNAME to PROPVAL on files, directories, or revisions. The first example creates a versioned, local property change in the working copy, and the second creates an unversioned, remote property change on a repository @@ -2829,7 +2829,7 @@ in a Subversion repository. Your repository administrator must explicitly enable revision property modifications by creating a hook named - 'pre-revprop-change'. See pre-revprop-change. See for more information on hook scripts. @@ -3399,8 +3399,8 @@ Examples - If you're currently inside the directory 'vendors' - which was branched to 'vendors-with-fix' and you'd like + If you're currently inside the directory vendors + which was branched to vendors-with-fix and you'd like to switch your working copy to that branch: @@ -3720,7 +3720,7 @@ svnadmin create - Create a new, empty repository at REPOS_PATH. + Create a new, empty repository at REPOS_PATH. Synopsis @@ -3773,10 +3773,10 @@ Description Dump the contents of filesystem to stdout in a - 'dumpfile' portable format, sending feedback to stderr. - Dump revisions LOWER rev through UPPER rev. If no + dumpfile portable format, sending feedback to stderr. + Dump revisions LOWER rev through UPPER rev. If no revisions are given, dump all revision trees. If only - LOWER is given, dump that one revision tree. See LOWER is given, dump that one revision tree. See for a practical use. @@ -3897,7 +3897,7 @@ Berkeley DB creates logs of all changes to the repository, which allow it to recover in the face of catastrophe. Unless you enable - DB_LOGS_AUTOREMOVE, the log files + DB_LOGS_AUTOREMOVE, the log files accumulate, although most are no longer used and can be deleted to reclaim disk space. See for more @@ -3923,7 +3923,7 @@ Berkeley DB creates logs of all changes to the repository, which allow it to recover in the face of catastrophe. Unless you enable - DB_LOGS_AUTOREMOVE, the log files + DB_LOGS_AUTOREMOVE, the log files accumulate, although most are no longer used and can be deleted to reclaim disk space. See for more @@ -4177,7 +4177,7 @@ Examples Set the log message for revision 19 to the contents of - the file 'msg': + the file msg: $ svnadmin setlog /usr/local/svn/repos/ -r 19 msg @@ -4807,7 +4807,7 @@ Description List the properties of a path in the repository. With - -v, show the property values too. + , show the property values too. @@ -4863,7 +4863,7 @@ Description - Print the tree, starting at PATH_IN_REPOS (if + Print the tree, starting at PATH_IN_REPOS (if supplied, at the root of the tree otherwise), optionally showing node revision ids.