A typo in chapter 4

[C. Michael Pilato]

Actually, I think this usage is correct.  "whole.c" only appears in the
*right* side of the merge (because it was renamed from the "integer.c"
found in the left side).

On Sat, Nov 11, 2017 at 8:49 PM, wuzhouhui <wuzhouhui250 at gmail.com> wrote:

> 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>
>
>
> _______________________________________________
> svnbook-dev mailing list
> svnbook-dev at red-bean.com
> http://www.red-bean.com/mailman/listinfo/svnbook-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.red-bean.com/pipermail/svnbook-dev/attachments/20171114/317280c4/attachment.html>