[svnbook] r4182 committed - * en/book/ch04-branching-and-merging.xml...

[svnbook at googlecode.com]

Revision: 4182
Author:   ptburba at gmail.com
Date:     Tue Nov  8 12:11:50 2011
Log:      * en/book/ch04-branching-and-merging.xml
   (svn.branchmerge.switchwc): Don't imply we are using a
    single ongoing example in this chapter.  Add a tip re
    the need to use --ignore-ancestry for some switches.


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

Modified:
  /trunk/en/book/ch04-branching-and-merging.xml

=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml	Tue Nov  8 11:45:51 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml	Tue Nov  8 12:11:50 2011
@@ -2883,7 +2883,7 @@
      <para>The <command>svn switch</command> command transforms an
        existing working copy to reflect a different branch.  While this
        command isn't strictly necessary for working with branches, it
-      provides a nice shortcut.  In our earlier example,
+      provides a nice shortcut.  In one of our earlier examples,
        after creating your private branch, you checked out a fresh
        working copy of the new repository directory.  Instead, you can
        simply ask Subversion to change your working copy of
@@ -2951,6 +2951,16 @@
        mixture of working revisions, but they can also contain a
        mixture of repository locations as well.</para>

+    <tip>
+      <para>Typically switched subdirectories share common ancestry with
+        the location which is switched <quote>away</quote> from.  However
+        <command>svn switch</command> can switch a subdirectory to mirror
+        a repository location which it shares no common ancestry with.
+        To do this you need to use the
+        <option>--ignore-ancestry</option> option.
+    </para>
+    </tip>
+
      <para>If your working copy contains a number of switched subtrees
        from different repository locations, it continues to function as
        normal.  When you update, you'll receive patches to each subtree