From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: CEDET Merge Date: Sun, 22 Jan 2017 17:37:18 -0800 Organization: UCLA Computer Science Department Message-ID: 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> <8760l63gd9.fsf@engster.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1485135498 4437 195.159.176.226 (23 Jan 2017 01:38:18 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 23 Jan 2017 01:38:18 +0000 (UTC) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 Cc: kfogel@red-bean.com, edward.steere@gmail.com, Eli Zaretskii , stephen_leake@stephe-leake.org, emacs-devel@gnu.org To: David Engster , Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 23 02:38:13 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 1cVTa3-000849-GH for ged-emacs-devel@m.gmane.org; Mon, 23 Jan 2017 02:37:59 +0100 Original-Received: from localhost ([::1]:38481 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cVTa8-00079m-A9 for ged-emacs-devel@m.gmane.org; Sun, 22 Jan 2017 20:38:04 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39749) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cVTZZ-00079h-4W for emacs-devel@gnu.org; Sun, 22 Jan 2017 20:37:29 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cVTZY-0003vU-Bf for emacs-devel@gnu.org; Sun, 22 Jan 2017 20:37:29 -0500 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:41930) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cVTZU-0003tK-ER; Sun, 22 Jan 2017 20:37:24 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id D3FD61600A3; Sun, 22 Jan 2017 17:37:19 -0800 (PST) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id FbGGm5yZmryu; Sun, 22 Jan 2017 17:37:19 -0800 (PST) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id EFB641600A9; Sun, 22 Jan 2017 17:37:18 -0800 (PST) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id mpPNu8QnHAgX; Sun, 22 Jan 2017 17:37:18 -0800 (PST) Original-Received: from [192.168.1.9] (unknown [47.153.188.248]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id C5E061600A3; Sun, 22 Jan 2017 17:37:18 -0800 (PST) In-Reply-To: <8760l63gd9.fsf@engster.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 131.179.128.68 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:211570 Archived-At: David Engster wrote: > Yes, that's a problem with long-living feature branches. It'd be nice i= f > 'make ChangeLog' would use the commit date of the merge commit for all > commits that entered Emacs through a branch merge. As I understand it, that's not easy since git does not prefer one branch = to the=20 other in a merge, so any scheme we come up with will be as likely to reda= te=20 commits already in the master as to redate commits entering through the m= erge. > 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 Something like that should work. We aren't doing that now, which causes p= roblems=20 like the confusion noted. >(if 'make ChangeLog' would actually use the committer date, which > AFAICS it currently does not). gitlog-to-changelog uses %ct, not %at, for its 'git log' format, so 'make= =20 ChangeLog' should already be using committer date.