[svnbook] r3918 committed - * src/en/book/appb-svn-for-cvs-users.xml...
svnbook at googlecode.com
svnbook at googlecode.com
Tue Jul 26 14:42:48 CDT 2011
Revision: 3918
Author: cmpilato at gmail.com
Date: Tue Jul 26 12:41:33 2011
Log: * src/en/book/appb-svn-for-cvs-users.xml
Lose redundant (and ill-marked-up) information.
http://code.google.com/p/svnbook/source/detail?r=3918
Modified:
/trunk/src/en/book/appb-svn-for-cvs-users.xml
=======================================
--- /trunk/src/en/book/appb-svn-for-cvs-users.xml Tue Jul 5 09:25:22 2011
+++ /trunk/src/en/book/appb-svn-for-cvs-users.xml Tue Jul 26 12:41:33 2011
@@ -295,36 +295,10 @@
<filename>bloo.png</filename> means that it doesn't yet exist in
the working copy.)</para>
- <!-- ###TODO describe -v here as well as -uv. -u and -v use
- different <quote>long</quote> formats and need to be
- documented separately. Moreover, as you can combine -u and
- -v, it needs to be explained what each of them does. As -u is
- much more important than -v, and the example following that
- paragraph *is* about -u, not -v, my patch concentrated on
- that. -->
-
- <para>At this point, you should take a quick look at the list of
- all possible status codes in
- <xref linkend="svn.ref.svn.c.status"/>. Here are a few of the
- more common status codes you'll see:</para>
-
- <informalexample>
- <screen>
-A Resource is scheduled for Addition
-D Resource is scheduled for Deletion
-M Resource has local Modifications
-C Resource has Conflicts (changes have not been completely merged
- between the repository and working copy version)
-X Resource is eXternal to this working copy (may come from another
- repository). See <xref linkend="svn.advanced.externals" />
-? Resource is not under version control
-! Resource is missing or incomplete (removed by a tool other than
- Subversion)
-</screen>
- </informalexample>
-
<para>For a more detailed discussion of <command>svn
- status</command>, see <xref
linkend="svn.tour.cycle.examine.status" />.</para>
+ status</command>, including an explanation of the status codes
+ shown in the previous example, see
+ <xref linkend="svn.tour.cycle.examine.status" />.</para>
</sect2>
More information about the svnbook-dev
mailing list