From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10075 invoked by alias); 3 Jan 2011 08:06:28 -0000 Received: (qmail 10065 invoked by uid 22791); 3 Jan 2011 08:06:28 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 03 Jan 2011 08:06:23 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 90D662BAB82; Mon, 3 Jan 2011 03:06:21 -0500 (EST) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id ykOV1oITym+h; Mon, 3 Jan 2011 03:06:21 -0500 (EST) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id ECC172BAB76; Mon, 3 Jan 2011 03:06:20 -0500 (EST) Received: by joel.gnat.com (Postfix, from userid 1000) id CD3D6145870; Mon, 3 Jan 2011 12:06:10 +0400 (RET) Date: Mon, 03 Jan 2011 08:06:00 -0000 From: Joel Brobecker To: Eli Zaretskii Cc: hjl.tools@gmail.com, msnyder@vmware.com, mark.kettenis@xs4all.nl, gdb-patches@sourceware.org Subject: Re: [patch] more comment cleanups Message-ID: <20110103080610.GQ2396@adacore.com> References: <4D1E60A0.1020601@vmware.com> <201012312312.oBVNC4fc013647@glazunov.sibelius.xs4all.nl> <4D1E732E.4090002@vmware.com> <834o9tq96f.fsf@gnu.org> <4D1F71B0.9060006@vmware.com> <20110103043359.GO2396@adacore.com> <20110103073452.GP2396@adacore.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2011-01/txt/msg00036.txt.bz2 > > Whatever we decide for > > ChangeLogs does not matter to me; in fact, I think they should be > > abolished. They are the single-most source of conflicts as far as > > patch merging is concerned. > > There's the git-merge-changelog (from gnulib, I think) to take good > care of that. That could be useful indeed. The solution we use at AdaCore is to write these entries only when checking in the CVS tree at sourceware. Internally, we no longer use the ChangeLog (the information is stored inside the revision log). -- Joel