[svnbook commit] r3383 - trunk/src/en/book
C. Michael Pilato
cmpilato at red-bean.com
Thu Dec 18 19:41:15 CST 2008
Cool! I've associated this with issue #23. Some review comments inline below.
sussman wrote:
> Modified: trunk/src/en/book/ch01-fundamental-concepts.xml
> ==============================================================================
> --- trunk/src/en/book/ch01-fundamental-concepts.xml (original)
> +++ trunk/src/en/book/ch01-fundamental-concepts.xml Thu Dec 18 16:31:24 2008
[...]
> @@ -381,6 +381,22 @@
> marks so that your shell treats the whole thing as a single
> argument to the <command>svn</command> program.</para>
>
> + <para>In Subversion 1.6, a new carat (<command>^</command>)
That should be a <literal>^</literal>
> + notation was introduced as a shorthand for <quote>root of the
We should make it clear that this is always interpreted as URL:
... for <quote>the URL of the root ...
^^^^^^^^^^^^^^^
or
... for the repository root URL.
> + repository</quote>. For example:</para>
> +
> + <screen>
> +$ svn list ^/tags/bigsandwich/
> +</screen>
> +
> + <para>In this example, we're specifying
> + the <filename>/tags/bigsandwich</filename> directory in the
> + root of the repository. Note that this URL
> + syntax <emphasis>only</emphasis> works when you're sitting
> + within a working copy—the commandline client infers the
> + repository's URL by looking at the working copy.</para>
Minor nit: not sure "sitting within" will translate, but if we use this
verbiage elsewhere, don't sweat it.
> +
> +
> <sidebar id="svn.basic.in-action.wc.sb-1">
> <title>Repository URLs</title>
>
>
> Modified: trunk/src/en/book/ch04-branching-and-merging.xml
> ==============================================================================
> --- trunk/src/en/book/ch04-branching-and-merging.xml (original)
> +++ trunk/src/en/book/ch04-branching-and-merging.xml Thu Dec 18 16:31:24 2008
> @@ -542,20 +542,25 @@
> $ pwd
> /home/user/my-calc-branch
>
> -$ svn merge http://svn.example.com/repos/calc/trunk
> +$ svn merge ^/trunk
> --- Merging r345 through r356 into '.':
> U button.c
> U integer.c
> </screen>
>
> <para>This basic syntax—<userinput>svn merge
> - <replaceable>URL</replaceable></userinput>—tells Subversion to merge all recent
> - changes from the URL to the current working directory (which
> - is typically the root of your working copy). After running
> - the prior example, your branch working copy now contains new
> - local modifications, and these edits are duplications of all
> - of the changes that have happened on the trunk since you first
> - created your branch:</para>
> + <replaceable>URL</replaceable></userinput>—tells
> + Subversion to merge all recent changes from the URL to the
> + current working directory (which is typically the root of your
> + working copy). Also notice that we're using the carat
> + (<command>^</command>) syntax<footnote><para>This was
<literal>^</literal>, again (and throughout, if I missed any).
--
C. Michael Pilato <cmpilato at red-bean.com> | http://cmpilato.blogspot.com/
More information about the svnbook-dev
mailing list