[svnbook commit] r1269 - in trunk/src/nb: . book
sunny256
svnbook-dev at red-bean.com
Sat May 7 05:00:20 CDT 2005
Author: sunny256
Date: Sat May 7 05:00:19 2005
New Revision: 1269
Removed:
trunk/src/nb/book/glossary.xml
Modified:
trunk/src/nb/LAST_UPDATED
trunk/src/nb/TRANSLATION-STATUS
trunk/src/nb/book/book.xml
trunk/src/nb/book/ch09.xml
Log:
Merge changes between r1264:1268 in the English book into the Norwegian
version.
* src/nb/TRANSLATION-STATUS
Removed glossary.xml from list.
* src/nb/LAST_UPDATED
Updated to 1268 by make sync.
* src/nb/book/book.xml
Merged and updated r1267.
* src/nb/book/ch09.xml
Merged r1268, new section about svnversion.
* src/nb/book/glossary.xml
Deleted.
Modified: trunk/src/nb/LAST_UPDATED
==============================================================================
--- trunk/src/nb/LAST_UPDATED (original)
+++ trunk/src/nb/LAST_UPDATED Sat May 7 05:00:19 2005
@@ -1 +1 @@
-1264
+1268
Modified: trunk/src/nb/TRANSLATION-STATUS
==============================================================================
--- trunk/src/nb/TRANSLATION-STATUS (original)
+++ trunk/src/nb/TRANSLATION-STATUS Sat May 7 05:00:19 2005
@@ -54,7 +54,6 @@
book/ch09.xml
book/colo.xml
book/copyright.xml
- book/glossary.xml
book/images/VersioningModels.ppt
book/images/branches.ppt
misc-docs/best_practices.xml
Modified: trunk/src/nb/book/book.xml
==============================================================================
--- trunk/src/nb/book/book.xml (original)
+++ trunk/src/nb/book/book.xml Sat May 7 05:00:19 2005
@@ -19,7 +19,6 @@
<!ENTITY appb SYSTEM "appb.xml">
<!ENTITY appc SYSTEM "appc.xml">
<!ENTITY appd SYSTEM "appd.xml">
-<!ENTITY gloss SYSTEM "glossary.xml">
<!ENTITY license SYSTEM "copyright.xml">
<!ENTITY colo SYSTEM "colo.xml">
]>
@@ -43,15 +42,14 @@
<!ENTITY appb SYSTEM "appb.xml">
<!ENTITY appc SYSTEM "appc.xml">
<!ENTITY appd SYSTEM "appd.xml">
-<!ENTITY gloss SYSTEM "glossary.xml">
<!ENTITY license SYSTEM "copyright.xml">
<!ENTITY colo SYSTEM "colo.xml">
]>
- <!-- @ENGLISH {{{
- <book id="svn">
- @ENGLISH }}} -->
- <book id="svn" lang="no">
+<!-- @ENGLISH {{{
+<book id="svn">
+ at ENGLISH }}} -->
+<book id="svn" lang="no">
<!-- @ENGLISH {{{
<title>Version Control with Subversion</title>
@ENGLISH }}} -->
@@ -119,19 +117,21 @@
<holder>C. Michael Pilato</holder>
</copyright>
- <!-- @ENGLISH {{{
- <legalnotice><para>This work is licensed under the Creative
- Commons Attribution License. To view a copy of this license,
- visit http://creativecommons.org/licenses/by/2.0/ or send a
- letter to Creative Commons, 559 Nathan Abbott Way, Stanford,
- California 94305, USA.</para></legalnotice>
- @ENGLISH }}} -->
- <legalnotice><para>Dette verket er lisensiert under Creative
- Commons Attribution License.
+ <!-- @ENGLISH {{{
+ <legalnotice><para>This work is licensed under the Creative
+ Commons Attribution License. To view a copy of this license,
+ visit http://creativecommons.org/licenses/by/2.0/ or send a
+ letter to Creative Commons, 559 Nathan Abbott Way, Stanford,
+ California 94305, USA.</para></legalnotice>
+ @ENGLISH }}} -->
+ <legalnotice>
+ <para>Dette verket er lisensiert under Creative Commons
+ Attribution License.
For å se en kopi av denne lisensen, gå til
http://creativecommons.org/licenses/by/2.0/ eller send et brev
til Creative Commons, 559 Nathan Abbott Way, Stanford,
- California 94305, USA.</para></legalnotice>
+ California 94305, USA.</para>
+ </legalnotice>
</bookinfo>
@@ -155,5 +155,5 @@
&license;
&colo;
- </book>
- <!-- vim: set ft=svnbook : -->
+</book>
+<!-- vim: set ft=svnbook : -->
Modified: trunk/src/nb/book/ch09.xml
==============================================================================
--- trunk/src/nb/book/ch09.xml (original)
+++ trunk/src/nb/book/ch09.xml Sat May 7 05:00:19 2005
@@ -5404,6 +5404,134 @@
</sect1>
+ <!-- ================================================================= -->
+ <!-- ======================== SECTION 5 ============================== -->
+ <!-- ================================================================= -->
+ <sect1 id="svn-ch-9-sect-5">
+
+ <title><command>svnversion</command></title>
+
+ <refentry id="svn-ch-9-sect-5.1">
+ <refnamediv>
+ <refname>svnversion</refname>
+ <refpurpose>Summarize the local revision(s) of a working
+ copy.</refpurpose>
+ </refnamediv>
+
+ <refsect1 id="svn-ch-9-sect-5.1.1">
+ <title>Synopsis</title>
+ <programlisting>svnversion [OPTIONS] WC_PATH [TRAIL_URL]</programlisting>
+ </refsect1>
+
+ <refsect1 id="svn-ch-9-sect-5.1.2">
+ <title>Description</title>
+
+ <para><command>svnversion</command> is a program for
+ summarizing the revision mixture of a working copy. The
+ resultant revision number, or revision range, is written to
+ standard output.</para>
+
+ <para>TRAIL_URL, if present, is the trailing portion of the
+ URL used to determine if WC_PATH itself is switched
+ (detection of switches within WC_PATH does not rely on
+ TRAIL_URL).</para>
+
+ </refsect1>
+
+ <refsect1 id="svn-ch-9-sect-5.1.3">
+ <title>Switches</title>
+
+ <para>Like <command>svnserve</command>,
+ <command>svnversion</command> has no subcommands, it only
+ has switches.</para>
+
+ <variablelist>
+
+ <varlistentry>
+ <term><option>--no-newline</option> (<option>-n</option>)</term>
+ <listitem>
+ <para>Omit the usual trailing newline from the output.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--committed</option> (<option>-c</option>)</term>
+ <listitem>
+ <para>Use the last-changed revisions rather than the
+ current (i.e., highest locally available) revisions.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--help</option> (<option>-h</option>)</term>
+ <listitem>
+ <para>Print a help summary.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--version</option></term>
+ <listitem>
+ <para>Print the version of <command>svnversion</command>
+ and exit with no error.</para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+ </refsect1>
+
+ <refsect1 id="svn-ch-9-sect-5.1.4">
+ <title>Examples</title>
+
+ <para>If the working copy is all at the same revision (for
+ example, immediately after an update), then that revision is
+ printed out:</para>
+
+ <screen>$ svnversion .
+4168</screen>
+
+ <para>You can add TRAIL_URL to show that the working copy is
+ not switched from what you expect:</para>
+
+ <screen>$ svnversion . /repos/svn/trunk
+4168</screen>
+
+ <para>For a mixed-revision working copy, the range of
+ revisions present is printed:</para>
+
+ <screen>$ svnversion .
+4123:4168</screen>
+
+ <para>If the working copy contains modifications, a trailing
+ "M" is added:</para>
+
+ <screen>$ svnversion .
+4168M</screen>
+
+ <para>If the working copy is switched, a trailing "S" is
+ added:</para>
+
+ <screen>$ svnversion .
+4168S</screen>
+
+ <para>Thus, here is a mixed-revision, switched working copy
+ containing some local modifications:</para>
+
+ <screen>$ svnversion .
+4212:4168MS</screen>
+
+ <para>If invoked on a directory that is not a working copy,
+ <command>svnversion</command> assumes it is an exported
+ working copy and prints "exported":</para>
+
+ <screen>$ svnversion .
+exported</screen>
+
+ </refsect1>
+
+ </refentry>
+ </sect1>
+
</chapter>
<!--
More information about the svnbook-dev
mailing list