[svnbook] r3920 committed - * src/en/book/ch02-basic-usage.xml...
svnbook at googlecode.com
svnbook at googlecode.com
Tue Jul 26 14:57:09 CDT 2011
Revision: 3920
Author: cmpilato at gmail.com
Date: Tue Jul 26 12:52:25 2011
Log: * src/en/book/ch02-basic-usage.xml
Avoid redundant descriptions of common 'svn status' codes.
http://code.google.com/p/svnbook/source/detail?r=3920
Modified:
/trunk/src/en/book/ch02-basic-usage.xml
=======================================
--- /trunk/src/en/book/ch02-basic-usage.xml Fri Jul 22 01:49:50 2011
+++ /trunk/src/en/book/ch02-basic-usage.xml Tue Jul 26 12:52:25 2011
@@ -874,30 +874,40 @@
<para>If you run <userinput>svn status</userinput> at the top
of your working copy with no additional arguments, it will
- detect and report all file and tree changes you've made.
- Here are a few examples of the most common status codes
- that <command>svn status</command> can return. (Note that
- the text following <literal>#</literal> is not
- actually printed by <command>svn status</command>.)</para>
+ detect and report all file and tree changes you've
+ made.</para>
<informalexample>
<screen>
-? scratch.c # file is not under version control
-A stuff/loot/bloo.h # file is scheduled for addition
-C stuff/loot/lump.c # file has textual conflicts from an update
-D stuff/fish.c # file is scheduled for deletion
-M bar.c # the content in bar.c has local modifications
+$ svn st
+? scratch.c
+A stuff/loot
+A stuff/loot/new.c
+D stuff/old.c
+M bar.c
+$
</screen>
</informalexample>
- <para>In this output format, <command>svn status</command>
- prints seven columns of characters, followed by several
- whitespace characters, followed by a file or directory name.
- The first column tells the status of a file or directory
- and/or its contents. The codes we listed are:</para>
+ <para>In its default output mode, <command>svn
+ status</command> prints seven columns of characters,
+ followed by several whitespace characters, followed by a
+ file or directory name. The first column tells the status
+ of a file or directory and/or its contents. Some of the
+ most common codes that <command>svn status</command>
+ displays are:</para>
<variablelist>
+ <varlistentry>
+ <term><computeroutput>? item</computeroutput></term>
+ <listitem>
+ <para>The file, directory, or symbolic link
+ <filename>item</filename> is not under version
+ control.</para>
+ </listitem>
+ </varlistentry>
+
<varlistentry>
<term><computeroutput>A item</computeroutput></term>
<listitem>
More information about the svnbook-dev
mailing list