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: Wed, 10 Jun 2015 21:41:53 -0400 Message-ID: <77eglj58da.fsf@fencepost.gnu.org> References: <83h9qlnx5a.fsf@gnu.org> <83lhfwmy4r.fsf@gnu.org> <6ovbevf2zb.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1433987001 20504 80.91.229.3 (11 Jun 2015 01:43:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 11 Jun 2015 01:43:21 +0000 (UTC) To: 20717@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Jun 11 03:43:08 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 1Z2rWN-0002UJ-22 for geb-bug-gnu-emacs@m.gmane.org; Thu, 11 Jun 2015 03:43:07 +0200 Original-Received: from localhost ([::1]:42987 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2rWM-0006cL-3h for geb-bug-gnu-emacs@m.gmane.org; Wed, 10 Jun 2015 21:43:06 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58387) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2rWJ-0006cF-Kv for bug-gnu-emacs@gnu.org; Wed, 10 Jun 2015 21:43:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z2rWI-0006Qj-OE for bug-gnu-emacs@gnu.org; Wed, 10 Jun 2015 21:43:03 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:35533) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2rWI-0006Qf-Ky for bug-gnu-emacs@gnu.org; Wed, 10 Jun 2015 21:43:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Z2rWI-0000x8-8n for bug-gnu-emacs@gnu.org; Wed, 10 Jun 2015 21:43: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: Thu, 11 Jun 2015 01:43: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.14339869243569 (code B ref 20717); Thu, 11 Jun 2015 01:43:02 +0000 Original-Received: (at 20717) by debbugs.gnu.org; 11 Jun 2015 01:42:04 +0000 Original-Received: from localhost ([127.0.0.1]:49990 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z2rVM-0000vU-1J for submit@debbugs.gnu.org; Wed, 10 Jun 2015 21:42:04 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:44508) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z2rVI-0000uu-IY for 20717@debbugs.gnu.org; Wed, 10 Jun 2015 21:42:01 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z2rVC-00065S-G5 for 20717@debbugs.gnu.org; Wed, 10 Jun 2015 21:41:55 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:59452) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2rVC-00065O-Cv for 20717@debbugs.gnu.org; Wed, 10 Jun 2015 21:41:54 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1Z2rVB-000471-IW; Wed, 10 Jun 2015 21:41:53 -0400 X-Spook: DEA weapons of mass destruction SRI Islamist enemy of the X-Ran: _{1tUf\O3WU'r\WaQpNUR"hLhyw0x8uG:}XctJZu[|xfj;Te#`kuwI\BBs>-7$~kW-i{N* X-Hue: white X-Attribution: GM In-Reply-To: <6ovbevf2zb.fsf@fencepost.gnu.org> (Glenn Morris's message of "Wed, 10 Jun 2015 21:28:08 -0400") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). 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:103809 Archived-At: I've hopefully fixed the main issue, which is keeping gitmerge.el "skipped" entries out of the ChangeLog. It might be possible to correct the date of gitmerge'd entries, by tracking the date of the merge commit and the hashes it mentions, and using that date for all those hashes when they are found. By this won't work for normal merges, so it doesn't really seem worth bothering with.