From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: How to update the ChangeLog files in emacs-25? Date: Sun, 24 Jan 2016 16:22:01 -0800 Organization: UCLA Computer Science Department Message-ID: <56A56AA9.3080907@cs.ucla.edu> References: <87h9i3faym.fsf@petton.fr> <83egd73u7m.fsf@gnu.org> <87a8nu67b4.fsf@petton.fr> <83powq3dz0.fsf@gnu.org> <87twm2mtcl.fsf@petton.fr> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1453681354 733 80.91.229.3 (25 Jan 2016 00:22:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2016 00:22:34 +0000 (UTC) Cc: emacs-devel@gnu.org To: Nicolas Petton , Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 01:22:24 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aNUvH-0003Sc-KH for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2016 01:22:23 +0100 Original-Received: from localhost ([::1]:33901 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNUvG-0000Sc-Qw for ged-emacs-devel@m.gmane.org; Sun, 24 Jan 2016 19:22:22 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40510) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNUv4-0000SP-Rj for emacs-devel@gnu.org; Sun, 24 Jan 2016 19:22:11 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aNUv4-0000KR-3F for emacs-devel@gnu.org; Sun, 24 Jan 2016 19:22:10 -0500 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:49567) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNUuw-0000Js-Nq; Sun, 24 Jan 2016 19:22:02 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 600171601AA; Sun, 24 Jan 2016 16:22:02 -0800 (PST) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id WnGzx7MNng46; Sun, 24 Jan 2016 16:22:01 -0800 (PST) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 68506160819; Sun, 24 Jan 2016 16:22:01 -0800 (PST) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 6roKwkl00vGa; Sun, 24 Jan 2016 16:22:01 -0800 (PST) Original-Received: from [192.168.1.9] (pool-100-32-155-148.lsanca.fios.verizon.net [100.32.155.148]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 44C511601AA; Sun, 24 Jan 2016 16:22:01 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 In-Reply-To: <87twm2mtcl.fsf@petton.fr> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 131.179.128.68 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:198736 Archived-At: Nicolas Petton wrote: > Eli Zaretskii writes: > >> That's easy to fix, no? > > Yes, but I thought that this check must be there for a reason... I put it there because I thought it'd be a pain if everybody updated their ChangeLog.2 files in their own branches and then tried to merge the results by hand. But if people want to take the trouble to do that, by all means go ahead....