From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ted Zlatanov Newsgroups: gmane.emacs.devel Subject: Re: ChangeLog dates Date: Fri, 28 Nov 2014 06:02:46 -0500 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: <87oarr4mg9.fsf@lifelogs.com> References: <21622.54248.721592.407612@a1i15.kph.uni-mainz.de> <83ioi0oc6a.fsf@gnu.org> <87a93c5fgt.fsf@lifelogs.com> <83lhmvn2qi.fsf@gnu.org> Reply-To: emacs-devel@gnu.org NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1417172569 22649 80.91.229.3 (28 Nov 2014 11:02:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 28 Nov 2014 11:02:49 +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:02:43 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 1XuJJy-0004iu-Dl for ged-emacs-devel@m.gmane.org; Fri, 28 Nov 2014 12:02:42 +0100 Original-Received: from localhost ([::1]:43503 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuJJy-0000jt-04 for ged-emacs-devel@m.gmane.org; Fri, 28 Nov 2014 06:02:42 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48216) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuJJg-0000it-7K for emacs-devel@gnu.org; Fri, 28 Nov 2014 06:02:29 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XuJJb-0007r4-BR for emacs-devel@gnu.org; Fri, 28 Nov 2014 06:02:24 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:45328) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuJJb-0007qo-4J for emacs-devel@gnu.org; Fri, 28 Nov 2014 06:02:19 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1XuJJa-0004ZC-2d for emacs-devel@gnu.org; Fri, 28 Nov 2014 12:02:18 +0100 Original-Received: from c-98-229-61-72.hsd1.ma.comcast.net ([98.229.61.72]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 28 Nov 2014 12:02:18 +0100 Original-Received: from tzz by c-98-229-61-72.hsd1.ma.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 28 Nov 2014 12:02:18 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 71 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: c-98-229-61-72.hsd1.ma.comcast.net X-Face: bd.DQ~'29fIs`T_%O%C\g%6jW)yi[zuz6; d4V0`@y-~$#3P_Ng{@m+e4o<4P'#(_GJQ%TT= D}[Ep*b!\e,fBZ'j_+#"Ps?s2!4H2-Y"sx" Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:R7YJ6LhsresJtcDB6UNHx2eAPqM= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:178408 Archived-At: (switching to the "ChangeLog dates" thread because it's more relevant) On Fri, 28 Nov 2014 09:22:21 +0100 Andreas Schwab wrote: AS> Ted Zlatanov writes: TZ> I used the recommended gnulib driver: >> TZ> [merge "merge-changelog"] TZ> name = GNU-style ChangeLog merge driver TZ> driver = /usr/local/bin/git-merge-changelog %O %A %B >> >> I'm not sure if this means that `git-merge-changelog' doesn't work the >> way the Emacs maintainers want, or that I used it incorrectly. Hints >> welcome. AS> You need to add this to .git/info/attributes: AS> ChangeLog* merge=merge-changelog I already have it, sorry if that was unclear. The merge driver is used, my question was whether it does the right thing because of Glenn's note about setting the date on merges, and in the end it may not matter because... On Fri, 28 Nov 2014 10:31:11 +0200 Eli Zaretskii wrote: >> From: Ted Zlatanov >> Date: Thu, 27 Nov 2014 19:33:50 -0500 >> TZ> [merge "merge-changelog"] TZ> name = GNU-style ChangeLog merge driver TZ> driver = /usr/local/bin/git-merge-changelog %O %A %B >> >> I'm not sure if this means that `git-merge-changelog' doesn't work the >> way the Emacs maintainers want, or that I used it incorrectly. Hints >> welcome. Most importantly, I need to know if I leave this in my >> gitconfig but try to use gitmerge.el, the result will be bad from the >> maintainers' perspective. EZ> I think you should keep that entry, but you need to examine the EZ> results in ChangeLog anyway. git-merge-changelog does try to be smart EZ> about where to put merged ChangeLog entries, but it cannot always do a EZ> perfect job. AFAICS, gitmerge.el doesn't fix that (maybe it should EZ> try), so manual labor is still required. When we move to auto-generated ChangeLogs it will be irrelevant, so I hope that's soon. 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. Ted