[svnbook commit] r2894 - trunk/src/en/book
fitz
noreply at red-bean.com
Sun Dec 2 18:04:04 CST 2007
Author: fitz
Date: Sun Dec 2 18:04:02 2007
New Revision: 2894
Log:
Update svn move and svn copy documentation for Subversion 1.5. This
does not include the listing of options for these commands (which will
be updated when I do all of Chapter 9.
This fixes issue #85.
* src/en/book/ch09-reference.xml, src/en/book/ch02-basic-usage.xml: Update.
Modified:
trunk/src/en/book/ch02-basic-usage.xml
trunk/src/en/book/ch09-reference.xml
Modified: trunk/src/en/book/ch02-basic-usage.xml
==============================================================================
--- trunk/src/en/book/ch02-basic-usage.xml (original)
+++ trunk/src/en/book/ch02-basic-usage.xml Sun Dec 2 18:04:02 2007
@@ -556,12 +556,13 @@
<listitem>
<para>Create a new item <filename>bar</filename> as a
duplicate of <filename>foo</filename> and automatically
- schedule <filename>bar</filename> for addition.
- When <filename>bar</filename> is added to the
- repository on the next commit, its copy history is
- recorded (as having originally come from
- <filename>foo</filename>). <command>svn copy</command>
- does not create intermediate directories.</para>
+ schedule <filename>bar</filename> for addition. When
+ <filename>bar</filename> is added to the repository on
+ the next commit, its copy history is recorded (as having
+ originally come from <filename>foo</filename>).
+ <command>svn copy</command> does not create intermediate
+ directories unless you pass the
+ <option>--parents</option>.</para>
</listitem>
</varlistentry>
@@ -574,7 +575,8 @@
addition as a copy of <filename>foo</filename>, and
<filename>foo</filename> is scheduled for removal.
<command>svn move</command> does not create intermediate
- directories.</para>
+ directories unless you pass the
+ <option>--parents</option>.</para>
</listitem>
</varlistentry>
Modified: trunk/src/en/book/ch09-reference.xml
==============================================================================
--- trunk/src/en/book/ch09-reference.xml (original)
+++ trunk/src/en/book/ch09-reference.xml Sun Dec 2 18:04:02 2007
@@ -1208,13 +1208,13 @@
<refsect1>
<title>Synopsis</title>
- <programlisting>svn copy SRC DST</programlisting>
+ <programlisting>svn copy SRC[@REV]... DST</programlisting>
</refsect1>
<refsect1>
<title>Description</title>
- <para>Copy a file in a working copy or in the repository.
+ <para>Copy one or more files in a working copy or in the repository.
<replaceable>SRC</replaceable> and
<replaceable>DST</replaceable> can each be either a
working copy (WC) path or URL:</para>
@@ -1254,6 +1254,17 @@
</variablelist>
+ <para>When copying multiple sources, they will be added as
+ children of <replaceable>DST</replaceable>, which must be
+ a directory.</para>
+
+ <para>If no peg revision (ie
+ <replaceable>@REV</replaceable>) is supplied, by default
+ the <literal>BASE</literal> revision will be used for
+ files copied from the working copy, while the
+ <literal>HEAD</literal> revision will be used for files
+ copied from a URL.</para>
+
<note>
<para>You can only copy files within a single repository.
Subversion does not support cross-repository copying.</para>
@@ -1311,6 +1322,24 @@
A + bar.txt
</screen>
+ <para>Copy several files in a working copy into a
+ subdirectory:</para>
+
+ <screen>
+$ svn cp bat.c baz.c qux.c src
+A src/bat.c
+A src/baz.c
+A src/qux.c
+</screen>
+
+ <para>Copy revision 8 of <literal>bat.c</literal> into your
+ working copy under a different name:</para>
+
+ <screen>
+$ svn cp bat.c ya-old-bat.c
+A ya-old-bat.c
+</screen>
+
<para>Copy an item in your working copy to a URL in the
repository (an immediate commit, so you must supply a
commit message):</para>
@@ -2897,12 +2926,12 @@
</refnamediv>
<refsect1>
<title>Synopsis</title>
- <programlisting>svn move SRC DST</programlisting>
+ <programlisting>svn move SRC... DST</programlisting>
</refsect1>
<refsect1>
<title>Description</title>
- <para>This command moves a file or directory in your
+ <para>This command moves files or directories in your
working copy or in the repository.</para>
<tip>
@@ -2911,6 +2940,10 @@
delete</command>.</para>
</tip>
+ <para>When moving multiple sources, they will be added as
+ children of <replaceable>DST</replaceable>, which must be
+ a directory.</para>
+
<note>
<para>Subversion does not support moving between working
copies and URLs. In addition, you can only move files
@@ -2984,6 +3017,18 @@
D foo.c
</screen>
+ <para>Move several files in your working copy into a subdirectory:</para>
+
+ <screen>
+$ svn move baz.c bat.c qux.c src
+A src/baz.c
+D baz.c
+A src/bat.c
+D bat.c
+A src/qux.c
+D qux.c
+</screen>
+
<para>Move a file in the repository (an immediate commit,
so it requires a commit message):</para>
More information about the svnbook-dev
mailing list