From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 02 02:22:14 2015 Received: (at submit) by debbugs.gnu.org; 2 Jun 2015 06:22:14 +0000 Received: from localhost ([127.0.0.1]:36753 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YzfaY-0008KS-H7 for submit@debbugs.gnu.org; Tue, 02 Jun 2015 02:22:14 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:44474 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YzfaW-0008KI-5G for submit@debbugs.gnu.org; Tue, 02 Jun 2015 02:22:12 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1YzfaU-0000ys-FX; Tue, 02 Jun 2015 02:22:10 -0400 From: Glenn Morris To: submit@debbugs.gnu.org Subject: attribution of gitmerge.el merged entries in generated ChangeLog X-Spook: morse CDMA AIEWS Saddam Hussein Telex kilderkin Attorney X-Ran: fsG)1{i>y@|xk;[Ta0|Bv!~8g4JB/C--@wULX.kS}9r^8kw46VG8PXjor2cgpAM#aN\*-I X-Hue: red X-Debbugs-No-Ack: yes X-Attribution: GM Date: Tue, 02 Jun 2015 02:22:10 -0400 Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Package: emacs Version: 25.0.50 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. From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 02 02:23:58 2015 Received: (at control) by debbugs.gnu.org; 2 Jun 2015 06:23:58 +0000 Received: from localhost ([127.0.0.1]:36764 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YzfcD-0008PD-R8 for submit@debbugs.gnu.org; Tue, 02 Jun 2015 02:23:58 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:44558 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YzfcC-0008P2-4T for control@debbugs.gnu.org; Tue, 02 Jun 2015 02:23:56 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1YzfcB-0001Lb-Uq for control@debbugs.gnu.org; Tue, 02 Jun 2015 02:23:55 -0400 Date: Tue, 02 Jun 2015 02:23:55 -0400 Message-Id: Subject: control message for bug 19759 To: X-Mailer: mail (GNU Mailutils 2.1) From: Glenn Morris X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) block 19759 by 20717 From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 05 18:06:54 2015 Received: (at 20717) by debbugs.gnu.org; 5 Jun 2015 22:06:54 +0000 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 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 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 From: Glenn Morris To: 20717@debbugs.gnu.org Subject: Re: bug#20717: attribution of gitmerge.el merged entries in generated ChangeLog References: 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 Date: Fri, 05 Jun 2015 18:06:49 -0400 In-Reply-To: (Glenn Morris's message of "Tue, 02 Jun 2015 02:22:10 -0400") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 20717 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) 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. From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 06 02:55:57 2015 Received: (at 20717) by debbugs.gnu.org; 6 Jun 2015 06:55:58 +0000 Received: from localhost ([127.0.0.1]:42389 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z181N-0003uY-1t for submit@debbugs.gnu.org; Sat, 06 Jun 2015 02:55:57 -0400 Received: from mtaout29.012.net.il ([80.179.55.185]:58695) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z181K-0003uK-QB for 20717@debbugs.gnu.org; Sat, 06 Jun 2015 02:55:55 -0400 Received: from conversion-daemon.mtaout29.012.net.il by mtaout29.012.net.il (HyperSendmail v2007.08) id <0NPI00600FLE7O00@mtaout29.012.net.il> for 20717@debbugs.gnu.org; Sat, 06 Jun 2015 09:55:09 +0300 (IDT) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout29.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NPI006H5GJXIC30@mtaout29.012.net.il>; Sat, 06 Jun 2015 09:55:09 +0300 (IDT) Date: Sat, 06 Jun 2015 09:55:45 +0300 From: Eli Zaretskii Subject: Re: bug#20717: attribution of gitmerge.el merged entries in generated ChangeLog In-reply-to: X-012-Sender: halo1@inter.net.il To: Glenn Morris Message-id: <83h9qlnx5a.fsf@gnu.org> References: X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 20717 Cc: 20717@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: Eli Zaretskii List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) > From: Glenn Morris > Date: Fri, 05 Jun 2015 18:06:49 -0400 > > 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. I'm guessing that you are using "git log" to show this. That command could produce confusing results if you don't pay attention to branches and ancestry of each commit, because it shows a non-linear history in a linear fashion. That's unlike what "bzr log" did, where it would show only mainline commits by default, and if invoked with -n0, would show the commits on branches indented. I suggest to use "git log --graph" instead, where you should see that one of these commits was on a branch, and the one that's attributed to you is the merge-commit. For commits on "mainline", you can use "git log --first-parent" to show only mainline commits, but this will not help you in the case in point. From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 06 14:13:40 2015 Received: (at 20717) by debbugs.gnu.org; 6 Jun 2015 18:13:40 +0000 Received: from localhost ([127.0.0.1]:43435 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z1IbE-0005H2-2p for submit@debbugs.gnu.org; Sat, 06 Jun 2015 14:13:40 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:57069 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z1IbC-0005Gv-Pf for 20717@debbugs.gnu.org; Sat, 06 Jun 2015 14:13:39 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1Z1IbC-0004Kl-AM; Sat, 06 Jun 2015 14:13:38 -0400 From: Glenn Morris To: Eli Zaretskii Subject: Re: bug#20717: attribution of gitmerge.el merged entries in generated ChangeLog References: <83h9qlnx5a.fsf@gnu.org> X-Spook: PLO Plague Hacker Forest fire keyhole Brute forcing X-Ran: mbUQ05@Dj'G^}ZR$!JyUE1>bfB:jNs-#_9bEAK2Hm;9/nE7(m}(o:9RoH+\MXwG~E2s$&f X-Hue: black X-Debbugs-No-Ack: yes X-Attribution: GM Date: Sat, 06 Jun 2015 14:13:38 -0400 In-Reply-To: <83h9qlnx5a.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 06 Jun 2015 09:55:45 +0300") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 20717 Cc: 20717@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) 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. From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 06 14:49:00 2015 Received: (at 20717) by debbugs.gnu.org; 6 Jun 2015 18:49:00 +0000 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 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 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 From: Glenn Morris To: Eli Zaretskii Subject: Re: bug#20717: attribution of gitmerge.el merged entries in generated ChangeLog References: <83h9qlnx5a.fsf@gnu.org> 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-Debbugs-No-Ack: yes X-Attribution: GM Date: Sat, 06 Jun 2015 14:48:55 -0400 In-Reply-To: (Glenn Morris's message of "Sat, 06 Jun 2015 14:13:38 -0400") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 20717 Cc: 20717@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) 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. From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 06 15:32:16 2015 Received: (at 20717) by debbugs.gnu.org; 6 Jun 2015 19:32:17 +0000 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 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 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) 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) Date: Sat, 06 Jun 2015 22:32:04 +0300 From: Eli Zaretskii Subject: Re: bug#20717: attribution of gitmerge.el merged entries in generated ChangeLog In-reply-to: X-012-Sender: halo1@inter.net.il To: Glenn Morris Message-id: <83lhfwmy4r.fsf@gnu.org> References: <83h9qlnx5a.fsf@gnu.org> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 20717 Cc: 20717@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: Eli Zaretskii List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) > 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. From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 07 14:29:13 2015 Received: (at control) by debbugs.gnu.org; 7 Jun 2015 18:29:13 +0000 Received: from localhost ([127.0.0.1]:44295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z1fJo-00038u-JJ for submit@debbugs.gnu.org; Sun, 07 Jun 2015 14:29:13 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36975) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z1fJm-00038i-OD for control@debbugs.gnu.org; Sun, 07 Jun 2015 14:29:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z1fJh-0002u1-2T for control@debbugs.gnu.org; Sun, 07 Jun 2015 14:29:05 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:37908) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1fJg-0002tu-VS for control@debbugs.gnu.org; Sun, 07 Jun 2015 14:29:04 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1Z1fJg-0007ei-KX for control@debbugs.gnu.org; Sun, 07 Jun 2015 14:29:04 -0400 Subject: control message for bug 20717 To: X-Mailer: mail (GNU Mailutils 2.99.98) Message-Id: From: Glenn Morris Date: Sun, 07 Jun 2015 14:29:04 -0400 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) retitle 20717 generated ChangeLog entries for (git)merged commits From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 08 09:52:56 2015 Received: (at 20717) by debbugs.gnu.org; 8 Jun 2015 13:52:56 +0000 Received: from localhost ([127.0.0.1]:44872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z1xU0-0004V4-D3 for submit@debbugs.gnu.org; Mon, 08 Jun 2015 09:52:56 -0400 Received: from pruche.dit.umontreal.ca ([132.204.246.22]:58221) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z1xTz-0004Uw-0B for 20717@debbugs.gnu.org; Mon, 08 Jun 2015 09:52:55 -0400 Received: from fmsmemgm.homelinux.net (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id t58DqrXe006020; Mon, 8 Jun 2015 09:52:53 -0400 Received: by fmsmemgm.homelinux.net (Postfix, from userid 20848) id 66C6DAE13F; Mon, 8 Jun 2015 09:52:53 -0400 (EDT) From: Stefan Monnier To: Eli Zaretskii Subject: Re: bug#20717: attribution of gitmerge.el merged entries in generated ChangeLog Message-ID: References: <83h9qlnx5a.fsf@gnu.org> Date: Mon, 08 Jun 2015 09:52:53 -0400 In-Reply-To: <83h9qlnx5a.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 06 Jun 2015 09:55:45 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV5331=0 X-NAI-Spam-Version: 2.3.0.9393 : core <5331> : inlines <3172> : streams <1452064> : uri <1952827> X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: 20717 Cc: Glenn Morris , 20717@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) > For commits on "mainline", you can use "git log --first-parent" to > show only mainline commits, but this will not help you in the case in > point. Not only that: it will not always show you what you wanted to see, since it's much too easy to make a commit where the first parent is not the previous revision on the trunk but the previous revision in your own local branch instead (and much too hard to avoid this situation). Stefan From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 10 21:28:20 2015 Received: (at 20717) by debbugs.gnu.org; 11 Jun 2015 01:28:20 +0000 Received: from localhost ([127.0.0.1]:49985 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z2rI4-0000XI-9y for submit@debbugs.gnu.org; Wed, 10 Jun 2015 21:28:20 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42018) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z2rI2-0000X5-GF for 20717@debbugs.gnu.org; Wed, 10 Jun 2015 21:28:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z2rHw-0008PP-3r for 20717@debbugs.gnu.org; Wed, 10 Jun 2015 21:28:13 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:59289) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2rHw-0008PL-0Q for 20717@debbugs.gnu.org; Wed, 10 Jun 2015 21:28:12 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1Z2rHt-0007bK-Jb; Wed, 10 Jun 2015 21:28:09 -0400 From: Glenn Morris To: Eli Zaretskii Subject: Re: bug#20717: attribution of gitmerge.el merged entries in generated ChangeLog References: <83h9qlnx5a.fsf@gnu.org> <83lhfwmy4r.fsf@gnu.org> X-Spook: explosion CNCIS Gang AQAP cracking National X-Ran: $8Wj@P\u8<4XOP'Bm3]-mtY5hyh4"7qAGXt.z6(l9kH_(Ed9X'Xl%;x#oc)I.P"l*$l;{U X-Hue: cyan X-Debbugs-No-Ack: yes X-Attribution: GM Date: Wed, 10 Jun 2015 21:28:08 -0400 In-Reply-To: <83lhfwmy4r.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 06 Jun 2015 22:32:04 +0300") Message-ID: <6ovbevf2zb.fsf@fencepost.gnu.org> User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 20717 Cc: 20717@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Eli Zaretskii wrote: > 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? See http://lists.gnu.org/archive/html/emacs-diffs/2015-06/msg00090.html The word "merge" isn't even mentioned in gitlog-to-changelog, and it's 7 years old, so I assume no-one cares about such things. Frankly, it's not much more than a dump of "git log" with some formatting tweaks to make it look more like a ChangeLog. From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 10 21:42:04 2015 Received: (at 20717) by debbugs.gnu.org; 11 Jun 2015 01:42:04 +0000 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 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 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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 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 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 From: Glenn Morris To: 20717@debbugs.gnu.org Subject: Re: bug#20717: attribution of gitmerge.el merged entries in generated ChangeLog References: <83h9qlnx5a.fsf@gnu.org> <83lhfwmy4r.fsf@gnu.org> <6ovbevf2zb.fsf@fencepost.gnu.org> 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-Debbugs-No-Ack: yes X-Attribution: GM Date: Wed, 10 Jun 2015 21:41:53 -0400 In-Reply-To: <6ovbevf2zb.fsf@fencepost.gnu.org> (Glenn Morris's message of "Wed, 10 Jun 2015 21:28:08 -0400") Message-ID: <77eglj58da.fsf@fencepost.gnu.org> User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 20717 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) 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. From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 10 21:42:51 2015 Received: (at control) by debbugs.gnu.org; 11 Jun 2015 01:42:51 +0000 Received: from localhost ([127.0.0.1]:49993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z2rW6-0000we-R4 for submit@debbugs.gnu.org; Wed, 10 Jun 2015 21:42:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44805) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z2rW5-0000wQ-KV for control@debbugs.gnu.org; Wed, 10 Jun 2015 21:42:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z2rVz-0006O6-Vj for control@debbugs.gnu.org; Wed, 10 Jun 2015 21:42:44 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:59465) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2rVz-0006O2-SI for control@debbugs.gnu.org; Wed, 10 Jun 2015 21:42:43 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1Z2rVz-0004Cr-JO for control@debbugs.gnu.org; Wed, 10 Jun 2015 21:42:43 -0400 Subject: control message for bug 20717 To: X-Mailer: mail (GNU Mailutils 2.99.98) Message-Id: From: Glenn Morris Date: Wed, 10 Jun 2015 21:42:43 -0400 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) retitle 20717 date of generated ChangeLog entries for (git)merged commits severity 20717 wishlist From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 10 21:43:06 2015 Received: (at control) by debbugs.gnu.org; 11 Jun 2015 01:43:06 +0000 Received: from localhost ([127.0.0.1]:49998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z2rWL-0000xm-9j for submit@debbugs.gnu.org; Wed, 10 Jun 2015 21:43:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44857) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z2rWJ-0000wt-1R for control@debbugs.gnu.org; Wed, 10 Jun 2015 21:43:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z2rWC-0006Q5-1s for control@debbugs.gnu.org; Wed, 10 Jun 2015 21:42:57 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:59470) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2rWB-0006Q1-Uu for control@debbugs.gnu.org; Wed, 10 Jun 2015 21:42:55 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1Z2rWB-0004Dh-Mp for control@debbugs.gnu.org; Wed, 10 Jun 2015 21:42:55 -0400 Subject: control message for bug 19759 To: X-Mailer: mail (GNU Mailutils 2.99.98) Message-Id: From: Glenn Morris Date: Wed, 10 Jun 2015 21:42:55 -0400 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) unblock 19759 by 20717 From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 10 22:46:37 2015 Received: (at 20717) by debbugs.gnu.org; 11 Jun 2015 02:46:38 +0000 Received: from localhost ([127.0.0.1]:50011 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z2sVp-0003zV-9U for submit@debbugs.gnu.org; Wed, 10 Jun 2015 22:46:37 -0400 Received: from mtaout22.012.net.il ([80.179.55.172]:48008) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z2sVm-0003zC-RN for 20717@debbugs.gnu.org; Wed, 10 Jun 2015 22:46:36 -0400 Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NPR00F00ECVM400@a-mtaout22.012.net.il> for 20717@debbugs.gnu.org; Thu, 11 Jun 2015 05:46:28 +0300 (IDT) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NPR00F2GEDFM700@a-mtaout22.012.net.il>; Thu, 11 Jun 2015 05:46:28 +0300 (IDT) Date: Thu, 11 Jun 2015 05:46:19 +0300 From: Eli Zaretskii Subject: Re: bug#20717: attribution of gitmerge.el merged entries in generated ChangeLog In-reply-to: <6ovbevf2zb.fsf@fencepost.gnu.org> X-012-Sender: halo1@inter.net.il To: Glenn Morris Message-id: <83r3pjrmh0.fsf@gnu.org> References: <83h9qlnx5a.fsf@gnu.org> <83lhfwmy4r.fsf@gnu.org> <6ovbevf2zb.fsf@fencepost.gnu.org> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 20717 Cc: 20717@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: Eli Zaretskii List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) > From: Glenn Morris > Cc: 20717@debbugs.gnu.org > Date: Wed, 10 Jun 2015 21:28:08 -0400 > > Eli Zaretskii wrote: > > > 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? > > See > http://lists.gnu.org/archive/html/emacs-diffs/2015-06/msg00090.html > > The word "merge" isn't even mentioned in gitlog-to-changelog, and it's 7 > years old, so I assume no-one cares about such things. Frankly, it's not > much more than a dump of "git log" with some formatting tweaks to make > it look more like a ChangeLog. So should we manually correct the most glaring problems of the result of this? For example, the logs for commits I made on that branch should be deleted, as there's a summary log for the merge-commit later on that covers them all. Perhaps we should recommend that people use the ";" trick in the log messages they make on branches they intend to merge onto master later? From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 22 21:57:17 2017 Received: (at 20717) by debbugs.gnu.org; 23 Dec 2017 02:57:17 +0000 Received: from localhost ([127.0.0.1]:48524 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eSZzw-0006Kt-QQ for submit@debbugs.gnu.org; Fri, 22 Dec 2017 21:57:16 -0500 Received: from eggs.gnu.org ([208.118.235.92]:32841) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eSZzv-0006Kg-Sx for 20717@debbugs.gnu.org; Fri, 22 Dec 2017 21:57:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eSZzq-00027U-7L for 20717@debbugs.gnu.org; Fri, 22 Dec 2017 21:57:10 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:36573) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eSZzq-00027E-3I for 20717@debbugs.gnu.org; Fri, 22 Dec 2017 21:57:10 -0500 Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1eSZzp-0002sm-O6; Fri, 22 Dec 2017 21:57:09 -0500 From: Glenn Morris To: 20717@debbugs.gnu.org Subject: Re: bug#20717: attribution of gitmerge.el merged entries in generated ChangeLog References: <83h9qlnx5a.fsf@gnu.org> <83lhfwmy4r.fsf@gnu.org> <6ovbevf2zb.fsf@fencepost.gnu.org> <77eglj58da.fsf@fencepost.gnu.org> X-Spook: Blowfish military Hamas El Paso Ammonium nitrate AMEMB X-Ran: T^~S{G~&.*2QOzs`NduAJgJ4BU8{#rLwm"mO2M:u0DOHT/jB`62iJGym(:2&`sGrX4FI;k X-Hue: brightcyan X-Attribution: GM Date: Fri, 22 Dec 2017 21:57:09 -0500 In-Reply-To: <77eglj58da.fsf@fencepost.gnu.org> (Glenn Morris's message of "Wed, 10 Jun 2015 21:41:53 -0400") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 20717 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) There's obviously no interest in improving this, closing as wontfix. From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 22 21:57:33 2017 Received: (at control) by debbugs.gnu.org; 23 Dec 2017 02:57:33 +0000 Received: from localhost ([127.0.0.1]:48527 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eSa0D-0006LL-13 for submit@debbugs.gnu.org; Fri, 22 Dec 2017 21:57:33 -0500 Received: from eggs.gnu.org ([208.118.235.92]:32917) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eSa0B-0006L9-AO for control@debbugs.gnu.org; Fri, 22 Dec 2017 21:57:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eSa05-0002M9-Mx for control@debbugs.gnu.org; Fri, 22 Dec 2017 21:57:26 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:36576) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eSa05-0002Ls-Ik for control@debbugs.gnu.org; Fri, 22 Dec 2017 21:57:25 -0500 Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1eSa05-00036u-B3 for control@debbugs.gnu.org; Fri, 22 Dec 2017 21:57:25 -0500 Subject: control message for bug 20717 To: X-Mailer: mail (GNU Mailutils 2.99.98) Message-Id: From: Glenn Morris Date: Fri, 22 Dec 2017 21:57:25 -0500 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) tag 20717 wontfix close 20717 From unknown Fri Jun 20 07:23:06 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 20 Jan 2018 12:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator