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: master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Date: Tue, 27 Jan 2015 22:37:44 -0800 Organization: UCLA Computer Science Department Message-ID: <54C883B8.6050506@cs.ucla.edu> References: <20150128032211.21589.96959@vcs.savannah.gnu.org> <87mw53zijz.fsf@building.gnus.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 1422427098 23122 80.91.229.3 (28 Jan 2015 06:38:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 28 Jan 2015 06:38:18 +0000 (UTC) To: Lars Ingebrigtsen , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 28 07:38:18 2015 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 1YGMGW-0003VQ-Kw for ged-emacs-devel@m.gmane.org; Wed, 28 Jan 2015 07:38:16 +0100 Original-Received: from localhost ([::1]:51531 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGMGV-0005lS-T7 for ged-emacs-devel@m.gmane.org; Wed, 28 Jan 2015 01:38:15 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60543) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGMG5-0005Wo-M5 for emacs-devel@gnu.org; Wed, 28 Jan 2015 01:37:50 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGMG2-0006ch-GT for emacs-devel@gnu.org; Wed, 28 Jan 2015 01:37:49 -0500 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:53626) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGMG2-0006cZ-BM for emacs-devel@gnu.org; Wed, 28 Jan 2015 01:37:46 -0500 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 61943A600AD; Tue, 27 Jan 2015 22:37:45 -0800 (PST) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id a4bN5c88W1Ui; Tue, 27 Jan 2015 22:37:45 -0800 (PST) Original-Received: from [192.168.1.9] (pool-173-55-11-52.lsanca.fios.verizon.net [173.55.11.52]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 1B704A60036; Tue, 27 Jan 2015 22:37:45 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 In-Reply-To: <87mw53zijz.fsf@building.gnus.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 131.179.128.62 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:181879 Archived-At: Lars Ingebrigtsen wrote: > I hope that didn't ... destroy anything. This is git, so nothing is ever destroyed, it's just ... mutated. I repaired the problems I found in master commit 39c2fa3f4e5bf332cc30266d36d5410c4ffeaac4. Your commit merged from emacs-24, which is generally a good thing to do, so I left that part alone. I didn't fix the dates in the ChangeLogs; you can take a look at those. The convention is that the dates are supposed to be as of the merge, not as of the original checkin. Which reminds me, we need to get the ball rolling again on having ChangeLogs generated automatically, to avoid that part of the merge hassle in the future.