[svnbook commit] r3531 - Update the reference chapter to include a description of the tree-conflict

codesite-noreply at google.com codesite-noreply at google.com
Fri May 29 05:07:50 CDT 2009


Author: julianfoad at btopenworld.com
Date: Fri May 29 03:07:02 2009
New Revision: 3531

Modified:
    trunk/src/en/book/ch09-reference.xml

Log:
Update the reference chapter to include a description of the tree-conflict
marker column in "svn status" output. Also minor related changes.

Found by: Fabian Cenedese <Cenedese {_AT_} indel.ch>

* src/en/book/ch09-reference.xml
   (svn.ref.svn.c.status): Add a description of the tree conflict field.
     Update other column numbers. Update the examples accordingly. Add a
     description of the eighth column being blank, to avoid uncertainty.
     Fix grammar.


Modified: trunk/src/en/book/ch09-reference.xml
==============================================================================
--- trunk/src/en/book/ch09-reference.xml	(original)
+++ trunk/src/en/book/ch09-reference.xml	Fri May 29 03:07:02 2009
@@ -4442,9 +4442,9 @@
              it prints only summary information about locally modified
              items.</para>

-          <para>The first six columns in the output are each one
+          <para>The first seven columns in the output are each one
              character wide, and each column gives you information
-            about different aspects of each working copy item.</para>
+            about a different aspect of each working copy item.</para>

            <para>The first column indicates that an item
              was added, deleted, or otherwise changed:</para>
@@ -4691,10 +4691,30 @@

            </variablelist>

+          <para>The seventh column is populated only if the item is
+            the victim of a tree conflict:</para>

+          <variablelist>
+
+            <varlistentry>
+              <term><literal>' '</literal></term>
+              <listitem>
+                <para>Item is not the victim of a tree conflict.</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><literal>'C'</literal></term>
+              <listitem>
+                <para>Item is the victim of a tree conflict.</para>
+              </listitem>
+            </varlistentry>
+
+          </variablelist>

+          <para>The eighth column is always blank.</para>

-          <para>The out-of-date information appears in the seventh
+          <para>The out-of-date information appears in the ninth
              column (only if you pass the
              <option>--show-updates</option> option):</para>

@@ -4770,8 +4790,8 @@

            <screen>
  $ svn status wc
- M     wc/bar.c
-A  +   wc/qax.c
+ M      wc/bar.c
+A  +    wc/qax.c
  </screen>

            <para>If you want to find out what files in your working
@@ -4785,9 +4805,9 @@

            <screen>
  $ svn status -u wc
- M           965    wc/bar.c
-       *     965    wc/foo.c
-A  +         965    wc/qax.c
+ M            965    wc/bar.c
+        *     965    wc/foo.c
+A  +          965    wc/qax.c
  Status against revision:    981
  </screen>

@@ -4808,10 +4828,10 @@

            <screen>
  $ svn status -u -v wc
- M           965       938 sally        wc/bar.c
-       *     965       922 harry        wc/foo.c
-A  +         965       687 harry        wc/qax.c
-             965       687 harry        wc/zig.c
+ M            965       938 sally        wc/bar.c
+        *     965       922 harry        wc/foo.c
+A  +          965       687 harry        wc/qax.c
+              965       687 harry        wc/zig.c
  Head revision:   981
  </screen>





More information about the svnbook-dev mailing list