From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Missing changes in merges from emacs-25 to master Date: Tue, 22 Mar 2016 21:42:59 +0200 Message-ID: <834mby47uk.fsf@gnu.org> 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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1458675809 26441 80.91.229.3 (22 Mar 2016 19:43:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Mar 2016 19:43:29 +0000 (UTC) Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 22 20:43:29 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 1aiSDA-0008GL-N3 for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 20:43:28 +0100 Original-Received: from localhost ([::1]:39292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiSD9-0001sl-VL for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 15:43:27 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39916) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiSD6-0001ri-1q for emacs-devel@gnu.org; Tue, 22 Mar 2016 15:43:24 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiSD1-0004o1-RH for emacs-devel@gnu.org; Tue, 22 Mar 2016 15:43:23 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:33547) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiSD1-0004nx-Nr; Tue, 22 Mar 2016 15:43:19 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4471 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1aiSD0-00009k-CU; Tue, 22 Mar 2016 15:43:19 -0400 In-reply-to: <56F199B4.7060801@cs.ucla.edu> (message from Paul Eggert on Tue, 22 Mar 2016 12:15:00 -0700) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e 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:202098 Archived-At: > Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org > From: Paul Eggert > Date: Tue, 22 Mar 2016 12:15:00 -0700 > > On 03/22/2016 11:37 AM, Eli Zaretskii wrote: > > I don't want us to start fixing mistakes in Perl > > 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?