[svnbook commit] r2936 - trunk/src/en/book
fitz
noreply at red-bean.com
Mon Dec 17 02:22:39 CST 2007
Author: fitz
Date: Mon Dec 17 02:22:36 2007
New Revision: 2936
Log:
Update part of the command line reference for Subversion 1.5. From
svn add to svn merge (inclusive).
More to come.
Fixes part of issue #43.
* src/en/book/ch09-reference.xml (svn.ref.svn): My ham RADIO smells
like PORCUPINES!
Modified:
trunk/src/en/book/ch09-reference.xml
Modified: trunk/src/en/book/ch09-reference.xml
==============================================================================
--- trunk/src/en/book/ch09-reference.xml (original)
+++ trunk/src/en/book/ch09-reference.xml Mon Dec 17 02:22:36 2007
@@ -3088,6 +3088,78 @@
</refsect1>
</refentry>
+ <refentry id="svn.ref.svn.c.mergeinfo">
+
+ <indexterm>
+ <primary>svn</primary>
+ <secondary>subcommands</secondary>
+ <tertiary>mergeinfo</tertiary>
+ </indexterm>
+
+ <refnamediv>
+ <refname>svn mergeinfo</refname>
+ <refpurpose>Query merge-related information. See <xref
+ linkend="svn.branchmerge.basicmerging.mergeinfo"/> for
+ details.</refpurpose>
+ </refnamediv>
+ <refsect1>
+ <title>Synopsis</title>
+ <programlisting>svn mergeinfo [TARGET[@REV]...]</programlisting>
+
+ </refsect1>
+ <refsect1>
+ <title>Description</title>
+
+ <para></para>
+
+ </refsect1>
+ <refsect1>
+ <title>Alternate Names</title>
+ <para>None</para>
+ </refsect1>
+
+ <refsect1>
+ <title>Changes</title>
+ <para>Nothing</para>
+ </refsect1>
+
+ <refsect1>
+ <title>Accesses Repository</title>
+ <para>Yes</para>
+ </refsect1>
+
+ <refsect1>
+ <title>Options</title>
+
+ <screen>
+--revision (-r) REV
+--username USER
+--password PASS
+--no-auth-cache
+--non-interactive
+--config-dir DIR
+</screen>
+ </refsect1>
+
+ <refsect1>
+ <title>Examples</title>
+
+ <para>Find out which changesets your trunk directory has
+ already received as well as what changesets it's still
+ eligible to receive.</para>
+
+ <screen>
+$ svn mergeinfo branches/test
+Path: branches/test
+ Source path: /trunk
+ Merged ranges: r2:13
+ Eligible ranges: r13:15
+</screen>
+
+ </refsect1>
+ </refentry>
+
+
<refentry id="svn.ref.svn.c.mkdir">
<indexterm>
@@ -3115,8 +3187,9 @@
in the working copy. A directory specified by a URL is
created in the repository via an immediate commit.
Multiple directory URLs are committed atomically. In both
- cases all the intermediate directories must already
- exist.</para>
+ cases all the intermediate directories must already exist
+ unless the <option>--parents</option> option is
+ used.</para>
</refsect1>
<refsect1>
@@ -3141,6 +3214,8 @@
--message (-m) TEXT
--file (-F) FILE
--quiet (-q)
+--parents
+--with-revprop ARG
--username USER
--password PASS
--no-auth-cache
@@ -3257,6 +3332,8 @@
--revision (-r) REV (<emphasis>Deprecated</emphasis>)
--quiet (-q)
--force
+--parents
+--with-revprop ARG
--username USER
--password PASS
--no-auth-cache
@@ -3352,7 +3429,7 @@
<screen>
--quiet (-q)
---recursive (-R)
+--depth ARG
--revision (-r) REV
--revprop
--username USER
@@ -3360,6 +3437,7 @@
--no-auth-cache
--non-interactive
--config-dir DIR
+--changelist ARG
</screen>
</refsect1>
@@ -3395,11 +3473,12 @@
<refnamediv>
<refname>svn propedit</refname>
<refpurpose>Edit the property of one or more items under
- version control.</refpurpose>
+ version control. See <xref
+ linkend="svn.ref.svn.c.propset"/>.</refpurpose>
</refnamediv>
<refsect1>
<title>Synopsis</title>
- <programlisting>svn propedit PROPNAME PATH...</programlisting>
+ <programlisting>svn propedit PROPNAME TARGET...</programlisting>
<programlisting>svn propedit PROPNAME --revprop -r REV [TARGET]</programlisting>
</refsect1>
<refsect1>
@@ -3434,6 +3513,10 @@
<screen>
--revision (-r) REV
--revprop
+--message (-m) ARG
+--file (-F) ARG
+--force-log
+--with-revprop ARG
--username USER
--password PASS
--no-auth-cache
@@ -3510,15 +3593,17 @@
<title>Options</title>
<screen>
---recursive (-R)
+--depth ARG
--revision (-r) REV
--revprop
--strict
+--xml
--username USER
--password PASS
--no-auth-cache
--non-interactive
--config-dir DIR
+--changelist ARG
</screen>
</refsect1>
@@ -3593,15 +3678,17 @@
<screen>
--verbose (-v)
---recursive (-R)
+--depth ARG
--revision (-r) REV
--quiet (-q)
--revprop
+--xml
--username USER
--password PASS
--no-auth-cache
--non-interactive
--config-dir DIR
+--changelist ARG
</screen>
</refsect1>
@@ -3695,7 +3782,7 @@
--quiet (-q)
--revision (-r) REV
--targets FILENAME
---recursive (-R)
+--depth ARG
--revprop
--username USER
--password PASS
@@ -3704,6 +3791,7 @@
--encoding ENC
--force
--config-dir DIR
+--changelist ARG
</screen>
</refsect1>
More information about the svnbook-dev
mailing list