From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.0.0.0/16 X-Spam-Status: No, score=-2.5 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1c8y6P-0004D4-51 for mharc-bug-gnulib@gnu.org; Mon, 21 Nov 2016 18:34:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41435) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c8y6M-0004Cb-O7 for bug-gnulib@gnu.org; Mon, 21 Nov 2016 18:34:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c8y6I-00013y-QA for bug-gnulib@gnu.org; Mon, 21 Nov 2016 18:34:18 -0500 Received: from mo6-p00-ob.smtp.rzone.de ([2a01:238:20a:202:5300::10]:16259) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c8y6I-00012Y-Ep for bug-gnulib@gnu.org; Mon, 21 Nov 2016 18:34:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1479771252; l=795; s=domk; d=clisp.org; h=Content-Type:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Date:Subject:Cc:To:From; bh=tQyZ3jBksfWotCiWgcsvFlBkbUxVPGECSEutQhK0aRE=; b=E6ZbCSVbuwMzw4MmSLn0YlsrW7DO1nY0MrYTKLtiUjwuLpSTokZcpqwwwLpza56cEx q+z4ceZQ9gV8Ws2C7If/blRcRqJCMNPkZImi10dBiNP7MXL1AEUhRYn8oyiRiFBl3qNi 94tiZi9BhMKH9HTo3G9H9EhcUsheGZSjUg5AI= X-RZG-AUTH: :Ln4Re0+Ic/6oZXR1YgKryK8brksyK8dozXDwHXjf9hj/zDNRavU44/ecdQ== X-RZG-CLASS-ID: mo00 Received: from bruno.haible.de (dslb-088-068-033-140.088.068.pools.vodafone-ip.de [88.68.33.140]) by smtp.strato.de (RZmta 39.9 DYNA|AUTH) with ESMTPSA id e07596sALNYB217 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate); Tue, 22 Nov 2016 00:34:11 +0100 (CET) From: Bruno Haible To: Pedro Alves Cc: bug-gnulib@gnu.org Subject: Re: ChangeLog entries Date: Tue, 22 Nov 2016 00:34:09 +0100 Message-ID: <3612046.UvluEMGxo1@linuix.haible.de> User-Agent: KMail/4.8.5 (Linux/3.8.0-44-generic; KDE/4.8.5; x86_64; ; ) In-Reply-To: <669d9dd4-6794-f900-1ff8-64577b961843@redhat.com> References: <1478967774-14453-2-git-send-email-palves@redhat.com> <4455007.neO9shxJ08@linuix.haible.de> <669d9dd4-6794-f900-1ff8-64577b961843@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a01:238:20a:202:5300::10 X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Gnulib discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Nov 2016 23:34:19 -0000 Pedro Alves wrote: > > I added ChangeLog entries for your two patches from 2016-11-12 > > (that Paul committed). > > Thanks! Should I assume you're all using git-merge-changelog and Yes, we are all using the git-merge-changelog. It handles about 60% of the ChangeLog entry conflicts correctly. (A couple of years ago, it handled 95% of such conflicts correctly. I guess something in the git internals has changed...) > include ChangeLog changes in the diff as well as in the > commit log? Yes, this is how we all do it when we commit a patch. When a contributor sends in a patch, the person who pushes it on behalf of the author takes care of doing the right thing. Many of us also use vc-dwim: It makes it less tedious to create the detailed ChangeLog entry. Bruno