[svnbook commit] r1378 - trunk/src/en/book
kfogel
svnbook-dev at red-bean.com
Mon May 30 09:50:32 CDT 2005
Author: kfogel
Date: Mon May 30 09:50:31 2005
New Revision: 1378
Modified:
trunk/src/en/book/ch03.xml
trunk/src/en/book/ch09.xml
Log:
Finish documenting ' C' status code for property conflicts.
Daniel Rall noticed that this documentation might be lacking, and
Philip Martin confirmed it, here:
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=100837
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=100843
* src/en/book/ch03.xml
(CVS Users: Hold That Update!): Give an example of ' C' for property
conflicts.
* src/en/book/ch09.xml
(svn status): Make it clear that 'C' in the first column is about
content conflicts, not property conflicts.
Modified: trunk/src/en/book/ch03.xml
==============================================================================
--- trunk/src/en/book/ch03.xml (original)
+++ trunk/src/en/book/ch03.xml Mon May 30 09:50:31 2005
@@ -820,7 +820,8 @@
M + moved_dir/README # added with history and has local modifications
D stuff/fish.c # this file is scheduled for deletion
A stuff/loot/bloo.h # this file is scheduled for addition
-C stuff/loot/lump.c # this file has conflicts from an update
+C stuff/loot/lump.c # this file has textual conflicts from an update
+ C stuff/loot/glub.c # this file has property conflicts from an update
R xyz.c # this file is scheduled for replacement
S stuff/squawk # this file or dir has been switched to a branch
</screen>
Modified: trunk/src/en/book/ch09.xml
==============================================================================
--- trunk/src/en/book/ch09.xml (original)
+++ trunk/src/en/book/ch09.xml Mon May 30 09:50:31 2005
@@ -3243,8 +3243,9 @@
<varlistentry>
<term>'C'</term>
<listitem>
- <para>Item is in conflict with updates received from
- the repository.</para>
+ <para>The contents (as opposed to the properties) of
+ the item conflict with updates received from the
+ repository.</para>
</listitem>
</varlistentry>
More information about the svnbook-dev
mailing list