[svnbook] r4051 committed - * en/book/ch09-reference.xml...

[svnbook at googlecode.com]

Revision: 4051
Author:   cmpilato at gmail.com
Date:     Tue Aug 30 08:31:33 2011
Log:      * en/book/ch09-reference.xml
   More reference updates for Subversion 1.7.

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

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

=======================================
--- /trunk/en/book/ch09-reference.xml	Tue Aug 30 07:49:52 2011
+++ /trunk/en/book/ch09-reference.xml	Tue Aug 30 08:31:33 2011
@@ -3524,6 +3524,8 @@

            <informalexample>
              <screen>
+--depth ARG
+--recursive (-R)
  --revision (-r) REV
  --show-revs ARG
  </screen>
@@ -5335,15 +5337,23 @@

            <para>The first variant of this subcommand (without the
              <option>--relocate</option> option) updates your working
-            copy to point to a new URL—usually a URL that
-            shares a common ancestor with your working copy, although
-            not necessarily.  This is the Subversion way to move a
-            working copy to a new branch.  If specified,
+            copy to point to a new URL.  This is the Subversion way to
+            move a working copy to a new branch.  If specified,
              <replaceable>PEGREV</replaceable> determines in which
              revision the target is first looked up.  See <xref
              linkend="svn.branchmerge.switchwc"/> for an in-depth look
              at switching.</para>

+          <note>
+            <para>Beginning with Subversion 1.7, the <command>svn
+              switch</command> command will demand by default that the
+              URL to which you are switching your working copy shares
+              a common ancestry with item that the working copy
+              currently reflects.  You can override this behavior by
+              specifying the <option>--ignore-ancestry</option>
+              option.</para>
+          </note>
+
            <para>If <option>--force</option> is used, unversioned
              obstructing paths in the working copy do not automatically
              cause a failure if the switch attempts to add the same
@@ -5381,6 +5391,7 @@
  --depth ARG
  --diff3-cmd CMD
  --force
+--ignore-ancestry
  --ignore-externals
  --quiet (-q)
  --relocate
@@ -5425,9 +5436,13 @@
            </informalexample>

            <tip>
-            <para>You can switch just part of your working copy to a
-              branch if you don't want to switch your entire working
-              copy.</para>
+            <para>You <emphasis>can</emphasis> switch just part of
+              your working copy to a branch if you don't want to
+              switch your entire working copy, but this is not
+              generally recommended.  It's too easy to forget that
+              you've done this and wind up accidentally making and
+              committing changes both to the switched and unswitched
+              portions of your tree.</para>
            </tip>

          </refsect1>
@@ -5630,6 +5645,7 @@
  --editor-cmd CMD
  --force
  --ignore-externals
+--parents
  --quiet (-q)
  --revision (-r) REV
  --set-depth ARG