[svnbook] r3927 committed - * src/en/book/ch02-basic-usage.xml,...

svnbook at googlecode.com svnbook at googlecode.com
Thu Jul 28 10:28:57 CDT 2011


Revision: 3927
Author:   cmpilato at gmail.com
Date:     Thu Jul 28 08:28:00 2011
Log:      * 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
   Fix some examples which used subcommand short-forms ("co") instead
   of the full subcommand ("checkout").

Patch by: quinntaylor at mac.com

http://code.google.com/p/svnbook/source/detail?r=3927

Modified:
  /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/ch02-basic-usage.xml	Thu Jul 28 07:47:09 2011
+++ /trunk/src/en/book/ch02-basic-usage.xml	Thu Jul 28 08:28:00 2011
@@ -880,7 +880,7 @@

          <informalexample>
            <screen>
-$ svn st
+$ svn status
  ?       scratch.c
  A       stuff/loot
  A       stuff/loot/new.c
@@ -2774,7 +2774,7 @@

        <informalexample>
          <screen>
-$ svn ls -Rv svn://svn.example.com/trunk/
+$ svn list -Rv svn://svn.example.com/trunk/
        4 harry                 Feb 06 14:34 ./
        4 harry              23 Feb 06 14:34 COPYING
        4 harry              41 Feb 06 14:34 Makefile
@@ -2973,7 +2973,7 @@

        <informalexample>
          <screen>
-$ svn remove --force code/bar.c
+$ svn delete --force code/bar.c
  D         code/bar.c
  $ svn resolve --accept=working code/bar.c
  Resolved conflicted state of 'code/bar.c'
@@ -3016,7 +3016,7 @@

        <informalexample>
          <screen>
-$ svn remove --force code/baz.c
+$ svn delete --force code/baz.c
  D         code/baz.c
  $ svn resolve --accept=working code/bar.c
  Resolved conflicted state of 'code/bar.c'
=======================================
--- /trunk/src/en/book/ch03-advanced-topics.xml	Tue Jul 26 10:15:19 2011
+++ /trunk/src/en/book/ch03-advanced-topics.xml	Thu Jul 28 08:28:00 2011
@@ -4101,7 +4101,7 @@

        <informalexample>
          <screen>
-$ svn ci -m "Fix a UI bug found while working on math logic." \
+$ svn commit -m "Fix a UI bug found while working on math logic." \
        --changelist ui-fix
  Sending        button.c
  Transmitting file data .
=======================================
--- /trunk/src/en/book/ch04-branching-and-merging.xml	Tue Jul 19 12:26:54  
2011
+++ /trunk/src/en/book/ch04-branching-and-merging.xml	Thu Jul 28 08:28:00  
2011
@@ -3516,12 +3516,12 @@

            <row>
              <entry>Rearrange a branch or tag</entry>
-            <entry><userinput>svn mv <replaceable>URL1</replaceable>  
<replaceable>URL2</replaceable></userinput></entry>
+            <entry><userinput>svn move <replaceable>URL1</replaceable>  
<replaceable>URL2</replaceable></userinput></entry>
            </row>

            <row>
              <entry>Remove a branch or tag</entry>
-            <entry><userinput>svn rm  
<replaceable>URL</replaceable></userinput></entry>
+            <entry><userinput>svn delete  
<replaceable>URL</replaceable></userinput></entry>
            </row>
          </tbody>
        </tgroup>
=======================================
--- /trunk/src/en/book/ch09-reference.xml	Thu Jul 28 08:15:08 2011
+++ /trunk/src/en/book/ch09-reference.xml	Thu Jul 28 08:28:00 2011
@@ -1385,7 +1385,7 @@
  A    project/lib/anotherfile.c
  A    project/include/header.h
  Checked out revision 21.
-$ svn st wc
+$ svn status wc
  M       project/lib/file.c
  $ svn diff wc
  Index: project/lib/file.c
@@ -1429,7 +1429,7 @@
  Adding         newproject/notes/README

  Committed revision 22.
-$ svn co file://`pwd`/repos-1.6/newproject/trunk newproject --force
+$ svn checkout file://`pwd`/repos-1.6/newproject/trunk newproject --force
  E    newproject/include
  E    newproject/include/newproject.h
  E    newproject/lib
@@ -1438,7 +1438,7 @@
  E    newproject/notes
  E    newproject/notes/README
  Checked out revision 2.
-$ svn st newproject
+$ svn status newproject
  $
  </screen>
            </informalexample>
@@ -3658,7 +3658,7 @@

            <informalexample>
              <screen>
-$ svn pget svn:mergeinfo ^/branches/test
+$ svn propget svn:mergeinfo ^/branches/test
  /branches/other:3-4
  /trunk:11-13,14,16
  $ svn mergeinfo --show-revs merged ^/trunk ^/branches/test




More information about the svnbook-dev mailing list