From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#20717: attribution of gitmerge.el merged entries in generated ChangeLog Date: Sat, 06 Jun 2015 14:48:55 -0400 Message-ID: References: <83h9qlnx5a.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1433616558 2822 80.91.229.3 (6 Jun 2015 18:49:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 6 Jun 2015 18:49:18 +0000 (UTC) Cc: 20717@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Jun 06 20:49:09 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1Z1J9Y-0005tk-7J for geb-bug-gnu-emacs@m.gmane.org; Sat, 06 Jun 2015 20:49:08 +0200 Original-Received: from localhost ([::1]:52323 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1J9X-0002PH-DX for geb-bug-gnu-emacs@m.gmane.org; Sat, 06 Jun 2015 14:49:07 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42636) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1J9T-0002P0-K8 for bug-gnu-emacs@gnu.org; Sat, 06 Jun 2015 14:49:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z1J9S-0000u8-Mz for bug-gnu-emacs@gnu.org; Sat, 06 Jun 2015 14:49:03 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:33497) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1J9S-0000tw-Jx for bug-gnu-emacs@gnu.org; Sat, 06 Jun 2015 14:49:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Z1J9S-00066i-0z for bug-gnu-emacs@gnu.org; Sat, 06 Jun 2015 14:49:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Glenn Morris Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 06 Jun 2015 18:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20717 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 20717-submit@debbugs.gnu.org id=B20717.143361654023465 (code B ref 20717); Sat, 06 Jun 2015 18:49:01 +0000 Original-Received: (at 20717) by debbugs.gnu.org; 6 Jun 2015 18:49:00 +0000 Original-Received: from localhost ([127.0.0.1]:43472 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z1J9P-00066O-4F for submit@debbugs.gnu.org; Sat, 06 Jun 2015 14:48:59 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:57555 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z1J9M-00066G-Ks for 20717@debbugs.gnu.org; Sat, 06 Jun 2015 14:48:57 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1Z1J9L-0002pz-Ln; Sat, 06 Jun 2015 14:48:55 -0400 X-Spook: NATO Rootkit NASA Enriched AMW Human to Human KGB X-Ran: U<,)II&Gn|YhuUH_y!=-$;}T]hgu8qCjdn9hf6HU{T=DGyhbbT}Chw/}<26P`R.6Y3Xg\% X-Hue: blue X-Attribution: GM In-Reply-To: (Glenn Morris's message of "Sat, 06 Jun 2015 14:13:38 -0400") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:103669 Archived-At: Glenn Morris wrote: > Eli Zaretskii wrote: > >> I'm guessing that you are using "git log" to show this. > > No, I'm using `make ChangeLog' like I said in the original message. > This produces a ChangeLog which is a confusing mess where merges are > involved. To expand: 1. The dates of merged entries are wrong by an arbitrary amount. You can see the "cairo" entries in current ChangeLog.2 for an example of this. IIUC, this isn't fixable without getting the reflog involved. Ref: http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00102.html 2. Entries that were "skipped" when gitmerge.el'ing from emacs-24 to master still appear in the generated ChangeLog. Check tomorrow's automatically updated ChangeLog.2 for examples of that. Or type `make ChangeLog' today. You'll see entries like 2015-04-11 Ulrich Mueller Bump Emacs version to 24.5.50. that were skipped when merging from emacs-24. It's especially confusing because if merging isn't done very often (and recent history suggests it won't be), these entries will be offset from the relevant "Merge from origin/emacs-24" entry by a large distance. This isn't an issue now because the emacs-24 branch is basically dead, but it will be for the next release. I would hope that this one is fixable, with some work on admin/gitmerge.el and/or build-aux/gitlog-to-changelog. But I get the impression that a readable ChangeLog isn't much of a priority for Emacs anymore. Maybe no-one will miss it.