A typo in chapter 4

C. Michael Pilato cmpilato at red-bean.com
Wed Nov 8 08:52:07 CST 2017


You are correct.  And, oddly enough, the 1.7 branch has this correct.  Oh!
I see.  The 1.7 branch was cut before Paul reworked the 'svn blame'
examples on trunk.  So 1.7 refers to "button.c" correctly; trunk refers
incorrectly to "Makefile".

I've committed your patch to trunk (though I made it use "src/button.c"
instead of just "button.c"), and will not backport it because that would be
the wrong thing to do.

Thanks!

On Wed, Nov 8, 2017 at 8:57 AM, wuzhouhui <wuzhouhui250 at gmail.com> wrote:

> Hi, Mike
>
> According to the context (examples followed), I think the file should be
> button.c,
> instead of Makefile. Am I right?
>
> Index: trunk/en/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 5484)
> +++ b/trunk/en/book/ch04-branching-and-merging.xml (working copy)
> @@ -2909,7 +2909,7 @@ Refactor the bazzle functions.
>       <para>The <command>svn blame</command> command also takes the
>         <option>--use-merge-history</option> (<option>-g</option>)
>         option.  If this option is neglected, somebody looking at
> -        a line-by-line annotation of <filename>Makefile</filename> may
> +        a line-by-line annotation of <filename>button.c</filename> may
>         get the mistaken impression that you were responsible for a
>         particular change:</para>
>
> _______________________________________________
> 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/20171108/b6a0db3b/attachment.html>


More information about the svnbook-dev mailing list