From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-85549-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 17050 invoked by alias); 27 Nov 2011 13:07:57 -0000
Received: (qmail 17041 invoked by uid 22791); 27 Nov 2011 13:07:56 -0000
X-SWARE-Spam-Status: No, hits=-2.7 required=5.0	tests=AWL,BAYES_00,RP_MATCHES_RCVD
X-Spam-Check-By: sourceware.org
Received: from fencepost.gnu.org (HELO fencepost.gnu.org) (140.186.70.10)    by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 27 Nov 2011 13:07:43 +0000
Received: from eliz by fencepost.gnu.org with local (Exim 4.71)	(envelope-from <eliz@gnu.org>)	id 1RUeSM-0003Dc-Jd; Sun, 27 Nov 2011 08:07:42 -0500
Date: Sun, 27 Nov 2011 13:07:00 -0000
Message-Id: <E1RUeSM-0003Dc-Jd@fencepost.gnu.org>
From: Eli Zaretskii <eliz@gnu.org>
To: Andrey Smirnov <andrew.smirnov@gmail.com>
CC: gdb-patches@sourceware.org, brobecker@adacore.com,	mark.kettenis@xs4all.nl, tromey@redhat.com
In-reply-to: <877h2l7nth.fsf@gmail.com> (message from Andrey Smirnov on Sun,	27 Nov 2011 19:27:22 +0700)
Subject: Re: Notes on -Wshadow patches
Reply-to: Eli Zaretskii <eliz@gnu.org>
References: <877h2l7nth.fsf@gmail.com>
X-IsSubscribed: yes
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
X-SW-Source: 2011-11/txt/msg00726.txt.bz2

> 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.