A typo in chapter 4

wuzhouhui wuzhouhui250 at gmail.com
Sat Nov 11 19:49:26 CST 2017


Hi, Mike

I found another wrong filename in chapter 4. According to the example
proposed, the file should be whole.c, instead of integer.c.

‚Äč‚ÄčIndex: book/ch04-branching-and-merging.xml
===================================================================
diff --git a/trunk/en/book/ch04-branching-and-merging.xml
b/trunk/en/book/ch04-branching-and-merging.xml
--- a/trunk/en/book/ch04-branching-and-merging.xml    (revision 5488)
+++ b/trunk/en/book/ch04-branching-and-merging.xml    (working copy)
@@ -3149,7 +3149,7 @@ Summary of conflicts:
         combine those changes, but rather raises a tree conflict<footnote>
         <para>If Sally hadn't made her change in r472, then Subversion
would
         notice that <filename>integer.c</filename> in the
-        target working copy is identical to <filename>integer.c</filename>
+        target working copy is identical to <filename>whole.c</filename>
         in the left-side of the merge and would allow your rename to
         succeed without a tree conflict:</para>
         <informalexample>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.red-bean.com/pipermail/svnbook-dev/attachments/20171112/8cd03f75/attachment.html>


More information about the svnbook-dev mailing list