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: ChangeLog dates Date: Fri, 28 Nov 2014 13:06:54 +0200 Message-ID: <83d287mvn5.fsf@gnu.org> References: <21622.54248.721592.407612@a1i15.kph.uni-mainz.de> <83ioi0oc6a.fsf@gnu.org> <87a93c5fgt.fsf@lifelogs.com> <83lhmvn2qi.fsf@gnu.org> <87oarr4mg9.fsf@lifelogs.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1417172851 27150 80.91.229.3 (28 Nov 2014 11:07:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 28 Nov 2014 11:07:31 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 28 12:07:24 2014 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 1XuJOT-0006fk-R2 for ged-emacs-devel@m.gmane.org; Fri, 28 Nov 2014 12:07:21 +0100 Original-Received: from localhost ([::1]:43523 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuJOT-0001pe-CC for ged-emacs-devel@m.gmane.org; Fri, 28 Nov 2014 06:07:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49302) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuJOA-0001pK-7h for emacs-devel@gnu.org; Fri, 28 Nov 2014 06:07:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XuJO4-0000vv-Ta for emacs-devel@gnu.org; Fri, 28 Nov 2014 06:07:02 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:38758) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuJO4-0000vk-Kq for emacs-devel@gnu.org; Fri, 28 Nov 2014 06:06:56 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NFQ00100XCFJK00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Fri, 28 Nov 2014 13:06:54 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NFQ001EFXJIJ410@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Fri, 28 Nov 2014 13:06:54 +0200 (IST) In-reply-to: <87oarr4mg9.fsf@lifelogs.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 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:178409 Archived-At: > From: Ted Zlatanov > Date: Fri, 28 Nov 2014 06:02:46 -0500 > > On Fri, 28 Nov 2014 10:33:41 +0200 Eli Zaretskii wrote: > > EZ> Until now we did the latter, i.e. updated the entry's date to the date > EZ> of the merge. I don't know what's TRT when ChangeLog's will be > EZ> generated. > >> > >> It's going to have to be the original date, because AFAIK it's part of > >> the commit hash. > > EZ> Of course; even I know that. > > I didn't before I checked :) > > EZ> But the script that generates ChangeLog from the commit log could > EZ> modify the dates, if we decide that to be TRT. > > It will be painful and I think faking the date was an artifact of the > static ChangeLog system rather than actually needed. It would probably > be better to preserve the original commit date in the auto-generated > ChangeLog but add a note that the commit was merged/backported to branch > X on date Y. Seen from the master's POV, keeping the dates from the original (branch) commits would be rewriting history, because the actual date the commits appeared on master are different.