Re: Notes on -Wshadow patches

[Eli Zaretskii <eliz@gnu.org>]

> From: Andrey Smirnov <andrew.smirnov@gmail.com>
> Cc: eliz@gnu.org,
>     brobecker@adacore.com,
>     mark.kettenis@xs4all.nl,
>     tromey@redhat.com
> Date: Sun, 27 Nov 2011 19:27:22 +0700
> 
>   If there's something I'm missing, and the inclusion of ChangeLog
>   contents in a diff is unavoidable, let me know, and I will make
>   appropriate changes.

Doesn't git support generation of ChangeLog entries from commit
messages?  I thought it did.  If it does, you should be able to
generate ChangeLog entries automatically.

> * Some statistics

Thanks for the footwork.

>   - At least 1 in 3 detected conflicts was a conflict of either type ALBW or
>     BWHD, both of which, I hope we can all agree, are either
>     unintentional mistake or a hack too clever for it's own good, which
>     makes the later editing of the code into "Operation" game.

I actually think that both ALBW and BWHD are perfectly valid C code,
and neither unintentional mistakes nor "too clever hacks".  The only
type of clashes that should be fixed are TYP2.