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: Missing changes in merges from emacs-25 to master Date: Tue, 22 Mar 2016 13:26:04 -0700 Organization: UCLA Computer Science Department Message-ID: <56F1AA5C.9080304@cs.ucla.edu> References: <56EE8B27.3090208@gmx.at> <83d1qp6on1.fsf@gnu.org> <56EEEE19.4000800@gmx.at> <8360wh6l1a.fsf@gnu.org> <56EEF6DA.3050104@gmx.at> <56EFA47D.8020303@cs.ucla.edu> <83zitr6civ.fsf@gnu.org> <83lh5b66jj.fsf@gnu.org> <8360wf5gmz.fsf@gnu.org> <83wpou4hb4.fsf@gnu.org> <56F18FAC.30100@cs.ucla.edu> <83fuvi4avz.fsf@gnu.org> <56F199B4.7060801@cs.ucla.edu> <834mby47uk.fsf@gnu.org> 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 1458678404 4064 80.91.229.3 (22 Mar 2016 20:26:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Mar 2016 20:26:44 +0000 (UTC) Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 22 21:26:34 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 1aiSsp-0004vU-2U for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 21:26:31 +0100 Original-Received: from localhost ([::1]:39481 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiSsn-0000FK-Ud for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 16:26:29 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58439) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiSsY-0000EV-Mt for emacs-devel@gnu.org; Tue, 22 Mar 2016 16:26:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiSsX-0005UC-Oy for emacs-devel@gnu.org; Tue, 22 Mar 2016 16:26:14 -0400 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:39376) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiSsS-0005PN-4g; Tue, 22 Mar 2016 16:26:08 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id F3A86161232; Tue, 22 Mar 2016 13:26:05 -0700 (PDT) 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 KfclR65RRFd6; Tue, 22 Mar 2016 13:26:05 -0700 (PDT) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 3C67E161234; Tue, 22 Mar 2016 13:26:05 -0700 (PDT) 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 mQdG1i7avBTc; Tue, 22 Mar 2016 13:26:05 -0700 (PDT) Original-Received: from penguin.cs.ucla.edu (Penguin.CS.UCLA.EDU [131.179.64.200]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 2233A161232; Tue, 22 Mar 2016 13:26:05 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 In-Reply-To: <834mby47uk.fsf@gnu.org> 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:202105 Archived-At: On 03/22/2016 12:42 PM, Eli Zaretskii wrote: >> OK, I can install the attached instead. It won't fix mistakes in >> Perl, and it will still be better than what we have now (where >> ChangeLog.2 is plainly bogus in the 'master' branch). It's intended >> as a stopgap measure until we come up with something better. > Isn't it easier and simpler just to delete ChangeLog.2 from the master > branch, and leave everything else intact? No, as that would erase the relevant emacs-25 history from the master branch. Also, it would leave intact the procedure for updating ChangeLog.2 in the master branch, even though we should not be using that procedure there as things stand, and Murphy's law would apply if we left it in there (someone would go ahead and use the procedure anyway).