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

[svnbook at googlecode.com]

Revision: 4154
Author:   ptburba at gmail.com
Date:     Fri Nov  4 09:33:10 2011
Log:      * en/book/ch04-branching-and-merging.xml
   (svn.branchmerge.basicmerging.mergeinfo.inheritance): Fix a typo
    and some incorrect output in the sidebar on mergeinfo inheritance.

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

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

=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml	Fri Nov  4 07:29:33 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml	Fri Nov  4 09:33:10 2011
@@ -1205,11 +1205,13 @@
  $ svn propget svn:mergeinfo ^/branches/proj-X
  /trunk:651-652,758*

-# Revision 758 in non-inheritable, but still applies to the path it is set  
on
+# Revision 758 is non-inheritable, but still applies to the path it is
+# set on. Here the '*' decorator signals that r758 is only partially
+# merged from trunk.
  $ svn mergeinfo ^/trunk ^/branches/proj-X
  651
  652
-758
+758*

  # Revision 758 is not reported as merged because it is non-inheritable
  # and applies only to ^/trunk