[svnbook] r3864 committed - Work on issue #125 ("1.6 change: svn status output (new 7th...

svnbook at googlecode.com svnbook at googlecode.com
Thu Jun 30 11:58:09 CDT 2011


Revision: 3864
Author:   cmpilato at gmail.com
Date:     Thu Jun 30 09:57:00 2011
Log:      Work on issue #125 ("1.6 change: svn status output (new 7th
column)").

* src/en/book/appb-svn-for-cvs-users.xml,
* src/en/book/ch02-basic-usage.xml,
* src/en/book/ch03-advanced-topics.xml,
* src/en/book/ch04-branching-and-merging.xml,
* src/en/book/ch09-reference.xml
   Update all 'svn status' examples to include the seventh column added
   in Subversion 1.6 to carry tree conflict information.
http://code.google.com/p/svnbook/source/detail?r=3864

Modified:
  /trunk/src/en/book/appb-svn-for-cvs-users.xml
  /trunk/src/en/book/ch02-basic-usage.xml
  /trunk/src/en/book/ch03-advanced-topics.xml
  /trunk/src/en/book/ch04-branching-and-merging.xml
  /trunk/src/en/book/ch09-reference.xml

=======================================
--- /trunk/src/en/book/appb-svn-for-cvs-users.xml	Tue May 26 08:17:39 2009
+++ /trunk/src/en/book/appb-svn-for-cvs-users.xml	Thu Jun 30 09:57:00 2011
@@ -264,8 +264,8 @@

        <screen>
  $ svn status
-M      foo.c
-M      bar/baz.c
+M       foo.c
+M       bar/baz.c
  </screen>

        <para>If you specify the <option>--show-updates</option>
@@ -274,10 +274,10 @@

        <screen>
  $ svn status -u
-M            1047   foo.c
-       *     1045   faces.html
-       *            bloo.png
-M            1050   bar/baz.c
+M             1047   foo.c
+        *     1045   faces.html
+        *            bloo.png
+M             1050   bar/baz.c
  Status against revision:   1066
  </screen>

=======================================
--- /trunk/src/en/book/ch02-basic-usage.xml	Tue Jun 28 12:21:51 2011
+++ /trunk/src/en/book/ch02-basic-usage.xml	Thu Jun 30 09:57:00 2011
@@ -928,7 +928,7 @@

          <screen>
  $ svn status stuff/fish.c
-D      stuff/fish.c
+D       stuff/fish.c
  </screen>

          <para><command>svn status</command> also has a
@@ -1151,7 +1151,7 @@

        <screen>
  $ svn status README
-M      foo
+M       foo
  $ svn revert README
  Reverted 'README'
  $ svn status README
@@ -1168,13 +1168,13 @@

        <screen>
  $ svn status foo
-?      foo
+?       foo
  $ svn add foo
  A         foo
  $ svn revert foo
  Reverted 'foo'
  $ svn status foo
-?      foo
+?       foo
  $
  </screen>

@@ -2502,11 +2502,11 @@

        <screen>
  $ svn status
-  L    somedir
-M      somedir/foo.c
+  L     somedir
+M       somedir/foo.c
  $ svn cleanup
  $ svn status
-M      somedir/foo.c
+M       somedir/foo.c
  </screen>

        <para>Don't confuse these working copy administrative locks with
=======================================
--- /trunk/src/en/book/ch03-advanced-topics.xml	Thu Jun 23 06:53:24 2011
+++ /trunk/src/en/book/ch03-advanced-topics.xml	Thu Jun 30 09:57:00 2011
@@ -754,7 +754,7 @@

        <screen>
  $ svn status calc/button.c
- M     calc/button.c
+ M      calc/button.c
  $ svn diff calc/button.c
  Property changes on: calc/button.c
  ___________________________________________________________________
@@ -806,8 +806,8 @@

          <screen>
  $ svn status calc
- C     calc/button.c
-?      calc/button.c.prej
+ C      calc/button.c
+?       calc/button.c.prej
  $ cat calc/button.c.prej
  Trying to change property 'linecount' from '1267' to '1301',
  but property has been locally changed from '1267' to '1256'.
@@ -1437,13 +1437,13 @@

      <screen>
  $ svn status calc
- M     calc/button.c
-?      calc/calculator
-?      calc/data.c
-?      calc/debug_log
-?      calc/debug_log.1
-?      calc/debug_log.2.gz
-?      calc/debug_log.3.gz
+ M      calc/button.c
+?       calc/calculator
+?       calc/data.c
+?       calc/debug_log
+?       calc/debug_log.1
+?       calc/debug_log.2.gz
+?       calc/debug_log.3.gz
  </screen>

      <para>In this example, you have made some property modifications
@@ -1480,9 +1480,9 @@

      <screen>
  $ svn status
- M     calc
- M     calc/button.c
-?      calc/data.c
+ M      calc
+ M      calc/button.c
+?       calc/data.c
  </screen>

      <para>Now, all that cruft is missing from the output!  Your
@@ -1501,14 +1501,14 @@

      <screen>
  $ svn status --no-ignore
- M     calc
- M     calc/button.c
-I      calc/calculator
-?      calc/data.c
-I      calc/debug_log
-I      calc/debug_log.1
-I      calc/debug_log.2.gz
-I      calc/debug_log.3.gz
+ M      calc
+ M      calc/button.c
+I       calc/calculator
+?       calc/data.c
+I       calc/debug_log
+I       calc/debug_log.1
+I       calc/debug_log.2.gz
+I       calc/debug_log.3.gz
  </screen>

      <para>As mentioned earlier, the list of file patterns to ignore is
@@ -2383,7 +2383,7 @@

        <screen>
  $ svn status
-     K banana.jpg
+     K  banana.jpg

  $ svn info banana.jpg
  Path: banana.jpg
@@ -2467,7 +2467,7 @@

        <screen>
  $ svn status
-M    K banana.jpg
+M    K  banana.jpg
  $ svn commit -m "Make banana more yellow"
  Sending        banana.jpg
  Transmitting file data .
@@ -2524,9 +2524,9 @@

        <screen>
  $ svn status -u
-M              23   bar.c
-M    O         32   raisin.jpg
-       *       72   foo.h
+M               23   bar.c
+M    O          32   raisin.jpg
+        *       72   foo.h
  Status against revision:     105
  $
  </screen>
@@ -2632,9 +2632,9 @@

        <screen>
  $ svn status -u
-M              23   bar.c
-M    O         32   raisin.jpg
-       *       72   foo.h
+M               23   bar.c
+M    O          32   raisin.jpg
+        *       72   foo.h
  Status against revision:     105
  $ svn unlock raisin.jpg
  svn: 'raisin.jpg' is not locked in this working copy
@@ -2690,9 +2690,9 @@

        <screen>
  $ svn status
-     K raisin.jpg
+     K  raisin.jpg
  $ svn status -u
-     B         32   raisin.jpg
+     B          32   raisin.jpg
  $ svn update
    B  raisin.jpg
  $ svn status
@@ -3672,8 +3672,8 @@

        <screen>
  $ svn status
-M      integer.c
-M      mathops.c
+M       integer.c
+M       mathops.c
  $
  </screen>

@@ -3700,8 +3700,8 @@
  $ svn status

  --- Changelist 'math-fixes':
-M      integer.c
-M      mathops.c
+M       integer.c
+M       mathops.c
  $
  </screen>

@@ -3719,9 +3719,9 @@
  $ svn status

  --- Changelist 'math-fixes':
-       button.c
-M      integer.c
-M      mathops.c
+        button.c
+M       integer.c
+M       mathops.c
  $
  </screen>

@@ -3750,11 +3750,11 @@
  $ svn status

  --- Changelist 'ui-fix':
-       button.c
+        button.c

  --- Changelist 'math-fixes':
-M      integer.c
-M      mathops.c
+M       integer.c
+M       mathops.c
  $
  </screen>

@@ -3775,11 +3775,11 @@
  $ svn status

  --- Changelist 'ui-fix':
-M      button.c
+M       button.c

  --- Changelist 'math-fixes':
-M      integer.c
-M      mathops.c
+M       integer.c
+M       mathops.c
  $
  </screen>

@@ -3872,8 +3872,8 @@
  $ svn status

  --- Changelist 'math-fixes':
-M      integer.c
-M      mathops.c
+M       integer.c
+M       mathops.c
  $
  </screen>

=======================================
--- /trunk/src/en/book/ch04-branching-and-merging.xml	Mon Jun 27 07:19:41  
2011
+++ /trunk/src/en/book/ch04-branching-and-merging.xml	Thu Jun 30 09:57:00  
2011
@@ -570,9 +570,9 @@

        <screen>
  $ svn status
- M     .
-M      button.c
-M      integer.c
+ M      .
+M       button.c
+M       integer.c
  </screen>

        <para>At this point, the wise thing to do is look at the changes
@@ -1004,8 +1004,8 @@
  U    integer.c

  $ svn status
- M     .
-M      integer.c
+ M      .
+M       integer.c

  $ svn diff
  …
@@ -1160,7 +1160,7 @@
  $ svn copy ^/calc/trunk/real.c at 807 ./real.c

  $ svn status
-A  +   real.c
+A  +    real.c

  $ svn commit -m "Resurrected real.c from revision 807, /calc/trunk/real.c."
  Adding         real.c
@@ -1286,7 +1286,7 @@
  U    integer.c

  $ svn status
-M      integer.c
+M       integer.c
  </screen>

        <para>You can now go through the usual testing procedures before
@@ -1701,7 +1701,7 @@
  $ svn merge -c 3328 --record-only ^/calc/trunk

  $ svn status
-M     .
+M       .

  $ svn propget svn:mergeinfo .
  /trunk:1680-3305,3328
=======================================
--- /trunk/src/en/book/ch09-reference.xml	Thu Jun 24 06:25:56 2010
+++ /trunk/src/en/book/ch09-reference.xml	Thu Jun 30 09:57:00 2011
@@ -1105,13 +1105,13 @@
  Path 'baz.c' is now a member of changelist 'issue1729'.

  $ svn status
-A      someotherfile.c
-A      test/sometest.c
+A       someotherfile.c
+A       test/sometest.c

  --- Changelist 'issue1729':
-A      foo.c
-A      bar.c
-A      baz.c
+A       foo.c
+A       bar.c
+A       baz.c

  $ svn commit --changelist issue1729 -m "Fixing Issue 1729."
  Adding         bar.c
@@ -1121,8 +1121,8 @@
  Committed revision 2.

  $ svn status
-A      someotherfile.c
-A      test/sometest.c
+A       someotherfile.c
+A       test/sometest.c
  </screen>

            <para>Note that only the files in changelist
@@ -1618,7 +1618,7 @@
  $ svn copy foo.txt bar.txt
  A         bar.txt
  $ svn status
-A  +   bar.txt
+A  +    bar.txt
  </screen>

            <para>Copy several files in a working copy into a
@@ -4419,8 +4419,8 @@
  Reverted whoops

  $ svn status
-?      mistake.txt
-?      whoops
+?       mistake.txt
+?       whoops
  </screen>

            <warning>




More information about the svnbook-dev mailing list