From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#20717: attribution of gitmerge.el merged entries in generated ChangeLog Date: Sat, 06 Jun 2015 22:32:04 +0300 Message-ID: <83lhfwmy4r.fsf@gnu.org> References: <83h9qlnx5a.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1433619212 9264 80.91.229.3 (6 Jun 2015 19:33:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 6 Jun 2015 19:33:32 +0000 (UTC) Cc: 20717@debbugs.gnu.org To: Glenn Morris Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Jun 06 21:33:10 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 1Z1JqA-0005aE-Gh for geb-bug-gnu-emacs@m.gmane.org; Sat, 06 Jun 2015 21:33:10 +0200 Original-Received: from localhost ([::1]:52414 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1Jq9-0001sN-R4 for geb-bug-gnu-emacs@m.gmane.org; Sat, 06 Jun 2015 15:33:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47440) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1Jq6-0001sI-Dn for bug-gnu-emacs@gnu.org; Sat, 06 Jun 2015 15:33:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z1Jq3-0002oN-4z for bug-gnu-emacs@gnu.org; Sat, 06 Jun 2015 15:33:06 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:33529) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1Jq3-0002oJ-1C for bug-gnu-emacs@gnu.org; Sat, 06 Jun 2015 15:33:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Z1Jq2-0007EV-Pn for bug-gnu-emacs@gnu.org; Sat, 06 Jun 2015 15:33:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 06 Jun 2015 19:33:02 +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.143361913727666 (code B ref 20717); Sat, 06 Jun 2015 19:33:02 +0000 Original-Received: (at 20717) by debbugs.gnu.org; 6 Jun 2015 19:32:17 +0000 Original-Received: from localhost ([127.0.0.1]:43504 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z1JpI-0007CA-6L for submit@debbugs.gnu.org; Sat, 06 Jun 2015 15:32:16 -0400 Original-Received: from mtaout27.012.net.il ([80.179.55.183]:45823) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z1JpC-0007Bt-GW for 20717@debbugs.gnu.org; Sat, 06 Jun 2015 15:32:11 -0400 Original-Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0NPJ00L00EYB5S00@mtaout27.012.net.il> for 20717@debbugs.gnu.org; Sat, 06 Jun 2015 22:27:14 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NPJ00M0YFDEDY10@mtaout27.012.net.il>; Sat, 06 Jun 2015 22:27:14 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il 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:103675 Archived-At: > From: Glenn Morris > Cc: 20717@debbugs.gnu.org > Date: Sat, 06 Jun 2015 14:48:55 -0400 > > 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. Do logs of changes made on feature branches also appear like that, and are also misplaced? E.g., what do you get there of the commits on the large-fonts branch I merged today? They shouldn't appear at all, I think. > I would hope that this one is fixable, with some work on admin/gitmerge.el > and/or build-aux/gitlog-to-changelog. I hope so too. > But I get the impression that a readable ChangeLog isn't much of a > priority for Emacs anymore. Maybe no-one will miss it. I will.