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: Fri, 20 Jan 2017 23:57:19 +0100 Message-ID: <87fukds5kg.fsf@engster.org> References: <87r348ul9n.fsf@gmail.com> <87lgugm2qg.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> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1484953094 31649 195.159.176.226 (20 Jan 2017 22:58:14 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 20 Jan 2017 22:58:14 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 20 23:58:10 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 1cUi85-0006kk-KX for ged-emacs-devel@m.gmane.org; Fri, 20 Jan 2017 23:57:57 +0100 Original-Received: from localhost ([::1]:57691 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUi8A-0001NT-Co for ged-emacs-devel@m.gmane.org; Fri, 20 Jan 2017 17:58:02 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38584) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUi7a-0001NO-RA for emacs-devel@gnu.org; Fri, 20 Jan 2017 17:57:27 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cUi7X-000425-Ra for emacs-devel@gnu.org; Fri, 20 Jan 2017 17:57:26 -0500 Original-Received: from randomsample.de ([5.45.97.173]:50491) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cUi7X-00040B-Hd for emacs-devel@gnu.org; Fri, 20 Jan 2017 17:57:23 -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=ej+jATrx63eJa5aLyiF0F6N3W6+pNvGaQ7dlQ6yV1L0=; b=O0j99Hb5lb5PYJ5GwCpLdG8UyLg4mD/tJjMoBsYGDq9fc8s6KsyVFM+SRVG1AhLnA/iymcD6Uf0TVetIeMu6zYeNuBE2XQqmGByvEvn+cl8ZPrM6+I5zMP1h2wgHfxHc; 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 1cUi7T-0002Po-W2; Fri, 20 Jan 2017 23:57:20 +0100 In-Reply-To: (Stefan Monnier's message of "Fri, 20 Jan 2017 17:40:45 -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:211447 Archived-At: Stefan Monnier writes: >> Yes, 'git am' does that automatically. However, I always followed the >> general rule that the generated ChangeLogs should have the date when the >> change enters the Emacs repository, so I'm not sure if I should even >> retain the original date? > > AFAIK, Git records the "author date" separately from the "commit date", > so The Right Thing To Do is to use the fancy --date argument to provide > the "author date". The ChangeLog can use the "commit date" if needed. Yes, git tracks 'Author' and 'Committer', each with their own date. So the ChangeLog generator script would need to use the name from 'Author' with the date from 'Committer'. But does it actually do that? And wouldn't it be pretty confusing to have dates in the ChangeLog that are years apart from those in the git log? -David