Hi !
I did not know whether to attach the patch to the issue or post it here
first. Anyway, I attached the patch, inline, and we'll see what comes
out of it.
Bye,
François
Log message
* doc/book/book/appa.xml:
Updated the section about the status codes to show the most common
ones.
Added reference to other sections for more details.
Left in a comment about the CVS update codes discussions that should
be moved elsewhere.
Index: doc/book/book/appa.xml
===================================================================
--- doc/book/book/appa.xml (revision 6656)
+++ doc/book/book/appa.xml (working copy)
@@ -285,20 +285,25 @@
than -v, and the example following that paragraph *is* about -u,
not -v, my patch concentrated on that. -->
- <para>Lastly, here's a quick summary of status codes that you may
- see:</para>
+ <para>Lastly, here's a quick summary of the most common status codes
that
+ you may see:</para>
<screen>
-A Add
-D Delete
-R Replace (delete, then re-add)
-M local Modification
-U Updated
-G merGed
-C Conflict
-X eXternal
+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 (comes from another
+ repository. See <xref linkend="svn-ch-6-sect-2.3.6" />)
+? Resource is not under revision control
+! Resource is missing or incomplete (removed by another tool than
+ Subversion)
</screen>
+ <!-- ###TODO: This paragraph should be moved elsewhere. We are
+ talking about status codes here, and not update.
+ Although CVS uses update as a form of status... -->
<para>Subversion has combined the CVS <command>P</command> and
<command>U</command> codes into just <command>U</command>. When
a merge or conflict occurs, Subversion simply prints
Developer of Java Gui Builder
http://jgb.sourceforge.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Aug 6 19:27:44 2003