From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: CEDET Merge Date: Sun, 22 Jan 2017 23:00:02 +0100 Message-ID: <8760l63gd9.fsf@engster.org> References: <87r348ul9n.fsf@gmail.com> <87inpelu8i.fsf@gmail.com> <837f5uajlk.fsf@gnu.org> <87a8aqlqz8.fsf@gmail.com> <8360leahxr.fsf@gnu.org> <8760lelq68.fsf@gmail.com> <83wpdt8yo2.fsf@gnu.org> <87inpd650y.fsf@gmail.com> <8660ldabje.fsf@stephe-leake.org> <8737gh5sqw.fsf@gmail.com> <87k29tv0r4.fsf@engster.org> <8737gguipm.fsf@engster.org> <87h94vdj3n.fsf@gmail.com> <87o9z2sog1.fsf@engster.org> <87vataadkk.fsf@red-bean.com> <87k29ps7ai.fsf@engster.org> <83vat862p9.fsf@gnu.org> <8my3y4xo49.fsf@fencepost.gnu.org> <83fukc5kfl.fsf@gnu.org> <8c7f5o8cu0.fsf@fencepost.gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1485122506 31260 195.159.176.226 (22 Jan 2017 22:01:46 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 22 Jan 2017 22:01:46 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) Cc: kfogel@red-bean.com, edward.steere@gmail.com, Eli Zaretskii , stephen_leake@stephe-leake.org, emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jan 22 23:01:41 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cVQCX-0006qP-Cn for ged-emacs-devel@m.gmane.org; Sun, 22 Jan 2017 23:01:29 +0100 Original-Received: from localhost ([::1]:37937 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cVQCc-0007tO-KR for ged-emacs-devel@m.gmane.org; Sun, 22 Jan 2017 17:01:34 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38638) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cVQBJ-0007GY-Bk for emacs-devel@gnu.org; Sun, 22 Jan 2017 17:00:14 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cVQBG-0002JZ-9Q for emacs-devel@gnu.org; Sun, 22 Jan 2017 17:00:13 -0500 Original-Received: from randomsample.de ([5.45.97.173]:38666) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cVQBF-0002I7-WB; Sun, 22 Jan 2017 17:00:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=f9pzWy7FBOguzvB/HNAMy9PcejVUuH+/xbrEEBbV9f4=; b=jaHKDxmGi7QVdnNtZHdcAUAhqXnxie34+30qVxoSiBQMMC7g2gLZgKPw6uUbW0wwYdMNu1I2+67JkuUb34zEMJJ1rPXTDsfoi8xV5tSOKWcnfOL1CKim5C7gCIPDxp6T; Original-Received: from ip4d16b353.dynamic.kabel-deutschland.de ([77.22.179.83] helo=isaac) by randomsample.de with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1cVQBA-0002Oy-6d; Sun, 22 Jan 2017 23:00:04 +0100 In-Reply-To: <8c7f5o8cu0.fsf@fencepost.gnu.org> (Glenn Morris's message of "Sat, 21 Jan 2017 13:52:55 -0500") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 5.45.97.173 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:211564 Archived-At: Glenn Morris writes: > Eli Zaretskii wrote: > >>> >> I always followed the general rule that the generated ChangeLogs >>> >> should have the date when the change enters the Emacs repository >>> > >>> > Indeed, that is our rule. >>> >>> That was the rule when ChangeLogs were hand-written, but since the >>> switch to generated ChangeLogs it does not (and cannot) apply. >>> Git does not record that date. >> >> Git obviously does record the commit date, so there's no problem with >> that rule. > > The commit date has no relation to "the date when the change enters the > Emacs repository" (ie, was pushed to Savannah). > > If you want a recent example of this, "make ChangeLog" and look at the > dates of "recent" concurrency entries. Some are years old. > > Eg git log --fuller 0ccc5d8998a > Both git dates are 2012-08-15, but the correct date would be 2016-12-10: > http://lists.gnu.org/archive/html/emacs-diffs/2016-12/msg00144.html Yes, that's a problem with long-living feature branches. It'd be nice if 'make ChangeLog' would use the commit date of the merge commit for all commits that entered Emacs through a branch merge. If that isn't easily possible, the person who does the merge could do a filter-branch before merging, setting GIT_COMMITTER_DATE to the current date (if 'make ChangeLog' would actually use the committer date, which AFAICS it currently does not). -David