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: Fri, 05 Jun 2015 18:06:49 -0400 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1433542038 12327 80.91.229.3 (5 Jun 2015 22:07:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 5 Jun 2015 22:07:18 +0000 (UTC) To: 20717@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Jun 06 00:07: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 1Z0zlb-0006gv-Hx for geb-bug-gnu-emacs@m.gmane.org; Sat, 06 Jun 2015 00:07:07 +0200 Original-Received: from localhost ([::1]:49836 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0zla-00084k-L2 for geb-bug-gnu-emacs@m.gmane.org; Fri, 05 Jun 2015 18:07:06 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56831) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0zlX-00083l-B6 for bug-gnu-emacs@gnu.org; Fri, 05 Jun 2015 18:07:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z0zlW-0005PR-Ez for bug-gnu-emacs@gnu.org; Fri, 05 Jun 2015 18:07:03 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:60523) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0zlW-0005PN-B6 for bug-gnu-emacs@gnu.org; Fri, 05 Jun 2015 18:07:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Z0zlV-0000HW-Vz for bug-gnu-emacs@gnu.org; Fri, 05 Jun 2015 18:07: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: Fri, 05 Jun 2015 22:07: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.14335420141070 (code B ref 20717); Fri, 05 Jun 2015 22:07:01 +0000 Original-Received: (at 20717) by debbugs.gnu.org; 5 Jun 2015 22:06:54 +0000 Original-Received: from localhost ([127.0.0.1]:42265 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z0zlN-0000HA-UH for submit@debbugs.gnu.org; Fri, 05 Jun 2015 18:06:54 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:49297 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z0zlL-0000H1-3g for 20717@debbugs.gnu.org; Fri, 05 Jun 2015 18:06:51 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1Z0zlK-0003AE-1N; Fri, 05 Jun 2015 18:06:50 -0400 X-Spook: Al Qa'ida Echelon Matamoros Agriculture DHS Tamil Tigers X-Ran: yogbnOzsCiLu*Om<>q*F3}.f9U*=_|q)b?i+K!`._WrL|#]^3hU7uEKzeTPrhf,k*3EY3? X-Hue: red X-Attribution: GM In-Reply-To: (Glenn Morris's message of "Tue, 02 Jun 2015 02:22:10 -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:103638 Archived-At: Glenn Morris wrote: > After using M-x gitmerge (which seems v nice, BTW), 'make ChangeLog' > creates a file with contents: > > 2015-06-01 Glenn Morris > > Merge from origin/emacs-24 > 8b5f2f4 * doc/emacs/emacs.texi: Update the ISBN of the Emacs manual. > > The merged entries should be listed under the name of the original > author(s), not the name of the person who did the merge. Oh, I see we actually get both. The above entry on the date of the merge, and another entry (with the correct attribution) on the date the change was originally made (which of course has zero relation to the merge date) in the original branch. And changes that were skipped from the merge are still included. What a confusing mess.