From unknown Sat Jun 21 12:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Resent-From: Ulrich Mueller Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 13 Nov 2014 22:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 19049@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.141591868831513 (code B ref -1); Thu, 13 Nov 2014 22:45:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Nov 2014 22:44:48 +0000 Received: from localhost ([127.0.0.1]:59910 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xp388-0008C9-Ky for submit@debbugs.gnu.org; Thu, 13 Nov 2014 17:44:48 -0500 Received: from eggs.gnu.org ([208.118.235.92]:54076) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xp383-0008Bw-Bb for submit@debbugs.gnu.org; Thu, 13 Nov 2014 17:44:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xp37v-0004Vw-Vd for submit@debbugs.gnu.org; Thu, 13 Nov 2014 17:44:39 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:46151) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xp37v-0004Vs-TM for submit@debbugs.gnu.org; Thu, 13 Nov 2014 17:44:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xp37p-0001oZ-18 for bug-gnu-emacs@gnu.org; Thu, 13 Nov 2014 17:44:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xp37h-0004UB-UI for bug-gnu-emacs@gnu.org; Thu, 13 Nov 2014 17:44:24 -0500 Received: from a1www.kph.uni-mainz.de ([134.93.134.1]:46296) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xp37h-0004Sz-Ox for bug-gnu-emacs@gnu.org; Thu, 13 Nov 2014 17:44:17 -0500 Received: from a1i15.kph.uni-mainz.de (a1i15.kph.uni-mainz.de [134.93.134.92]) by a1www.kph.uni-mainz.de (8.14.9/8.14.7) with ESMTP id sADMi4do020369 for ; Thu, 13 Nov 2014 23:44:04 +0100 Received: from a1i15.kph.uni-mainz.de (localhost [127.0.0.1]) by a1i15.kph.uni-mainz.de (8.14.8/8.14.2) with ESMTP id sADMi4Zn029436; Thu, 13 Nov 2014 23:44:04 +0100 Received: (from ulm@localhost) by a1i15.kph.uni-mainz.de (8.14.8/8.14.8/Submit) id sADMi4Do029432; Thu, 13 Nov 2014 23:44:04 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Message-ID: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> Date: Thu, 13 Nov 2014 23:44:04 +0100 X-Mailer: VM 8.2.0b under 24.3.1 (x86_64-pc-linux-gnu) From: Ulrich Mueller Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by a1www.kph.uni-mainz.de id sADMi4do020369 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) 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 (-----) The function tries to determine the version by calling: git log -1 --pretty=3Dformat:%N According to git documentation, format:%N will output "commit notes" which will be empty usually. Presumably, this should be format:%H, in order to output the commit hash. Patch is included below. >From bbe5ea6655c85e15ca7a2538f0c12c03b46fed6f Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Ulrich=3D20M=3DC3=3DBCller?=3D Date: Thu, 13 Nov 2014 23:43:23 +0100 Subject: [PATCH] emacs-repository-get-version: Fix git argument. MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit * version.el (emacs-repository-get-version): Call `git log' command with proper format argument. Signed-off-by: Ulrich M=FCller --- lisp/ChangeLog | 5 +++++ lisp/version.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5c0ec99..e2276d2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-11-13 Ulrich M=FCller + + * version.el (emacs-repository-get-version): Call `git log' + command with proper format argument. + 2014-11-13 Lars Magne Ingebrigtsen =20 * net/shr.el (shr-inhibit-images): Add a doc string. diff --git a/lisp/version.el b/lisp/version.el index 68b502c..1ea38da 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -188,7 +188,7 @@ only ask the VCS if we cannot find any information ou= rselves." (and (eq 0 (condition-case nil (call-process "git" nil '(t nil) nil "log" - "-1" "--pretty=3Dformat:%N") + "-1" "--pretty=3Dformat:%H") (error nil))) (not (zerop (buffer-size))) (replace-regexp-in-string "\n" "" (buffer-string)))))))) --=20 2.1.3 From unknown Sat Jun 21 12:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Resent-From: Lars Magne Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Nov 2014 04:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Ulrich Mueller Cc: 19049@debbugs.gnu.org Received: via spool by 19049-submit@debbugs.gnu.org id=B19049.14159377213643 (code B ref 19049); Fri, 14 Nov 2014 04:03:01 +0000 Received: (at 19049) by debbugs.gnu.org; 14 Nov 2014 04:02:01 +0000 Received: from localhost ([127.0.0.1]:60000 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xp85B-0000wc-2b for submit@debbugs.gnu.org; Thu, 13 Nov 2014 23:02:01 -0500 Received: from hermes.netfonds.no ([80.91.224.195]:50752) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xp858-0000wQ-Bb for 19049@debbugs.gnu.org; Thu, 13 Nov 2014 23:01:59 -0500 Received: from cm-84.215.51.58.getinternet.no ([84.215.51.58] helo=stories.gnus.org) by hermes.netfonds.no with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1Xp84o-0000xf-VS; Fri, 14 Nov 2014 05:01:39 +0100 From: Lars Magne Ingebrigtsen References: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> X-Now-Playing: Depeche Mode's _Music For The Masses_: "Little 15" X-Hashcash: 1:23:141114:ulm@gentoo.org::V2nM1bN9YHxtyxHZ:0004L6A X-Hashcash: 1:23:141114:19049@debbugs.gnu.org::bCRk5tjbCpfJnP9O:0000000000000000000000000000000000000000dIsp Date: Fri, 14 Nov 2014 05:01:38 +0100 In-Reply-To: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> (Ulrich Mueller's message of "Thu, 13 Nov 2014 23:44:04 +0100") Message-ID: User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-MailScanner-ID: 1Xp84o-0000xf-VS X-Netfonds-MailScanner: Found to be clean X-Netfonds-MailScanner-From: larsi@gnus.org MailScanner-NULL-Check: 1416542500.75391@gxilGrUuOUNOorim2WEIOg X-Spam-Status: No X-Spam-Score: 0.0 (/) 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: 0.0 (/) Ulrich Mueller writes: > The function tries to determine the version by calling: > > git log -1 --pretty=format:%N > > According to git documentation, format:%N will output "commit notes" > which will be empty usually. Presumably, this should be format:%H, in > order to output the commit hash. Patch is included below. Thanks; applied. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 13 23:06:10 2014 Received: (at control) by debbugs.gnu.org; 14 Nov 2014 04:06:10 +0000 Received: from localhost ([127.0.0.1]:60004 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xp89B-00013C-OV for submit@debbugs.gnu.org; Thu, 13 Nov 2014 23:06:10 -0500 Received: from hermes.netfonds.no ([80.91.224.195]:54262) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xp89A-000134-Oh for control@debbugs.gnu.org; Thu, 13 Nov 2014 23:06:09 -0500 Received: from cm-84.215.51.58.getinternet.no ([84.215.51.58] helo=stories.gnus.org) by hermes.netfonds.no with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1Xp88t-0000zr-8u for control@debbugs.gnu.org; Fri, 14 Nov 2014 05:05:51 +0100 Date: Fri, 14 Nov 2014 05:05:50 +0100 Message-Id: To: control@debbugs.gnu.org From: Lars Magne Ingebrigtsen Subject: control message for bug #19049 X-MailScanner-ID: 1Xp88t-0000zr-8u X-Netfonds-MailScanner: Found to be clean X-Netfonds-MailScanner-From: larsi@gnus.org MailScanner-NULL-Check: 1416542751.82313@X1gx1GBRDdSPwhX6Q6osYw X-Spam-Status: No X-Spam-Score: 0.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: 0.0 (/) tags 19049 fixed close 19049 25.1 From unknown Sat Jun 21 12:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Resent-From: Lars Magne Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Nov 2014 04:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed To: Ulrich Mueller Cc: 19049@debbugs.gnu.org Received: via spool by 19049-submit@debbugs.gnu.org id=B19049.14159380254166 (code B ref 19049); Fri, 14 Nov 2014 04:08:01 +0000 Received: (at 19049) by debbugs.gnu.org; 14 Nov 2014 04:07:05 +0000 Received: from localhost ([127.0.0.1]:60007 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xp8A1-00014P-A5 for submit@debbugs.gnu.org; Thu, 13 Nov 2014 23:07:05 -0500 Received: from hermes.netfonds.no ([80.91.224.195]:54267) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xp89v-00014C-Pm for 19049@debbugs.gnu.org; Thu, 13 Nov 2014 23:06:59 -0500 Received: from cm-84.215.51.58.getinternet.no ([84.215.51.58] helo=stories.gnus.org) by hermes.netfonds.no with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1Xp89b-00010Q-Bp; Fri, 14 Nov 2014 05:06:35 +0100 From: Lars Magne Ingebrigtsen References: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAGFBMVEU6JFpgm8T/+Kn/9ab1 4aL+8qT/76H+66AbdZjlAAACaklEQVQ4jW2UQW/bMAyFWaBArt1h23kS0t1FyOd2MJa7BKl3C6Tu bS39/T3ZTlMUY+Qk5mc+URRlKucsrJJr7b1L197K5Iwx1K2CaYK/YWhTYXbOkJhWWFS1Nq1Vuxax ZkQ0Y+F1XmvHQJAOIQsQvOqbzw2+YU0Te2bMEVi18FT7ASJbtnYAo2uRqvX19waK4+hGVoW1S8na X+f5ZURYH92IiFFHsi91B8Jeo7WW+mJ1zUjmACsHv88hFiuAHVI9DfcyQNGK9abet8SK6KTsxjrO WFdt+QA6JeGRVVscfPPNLlGXMNJdz1Otn8Dsk3PWUSuYeB1Pzu+4LvMsWKJxpCiVynjy/ZCSEEbZ Xzn7aZc6SPapYI4V6171Mvcxev+bU6qrD5YScj0K+z6+Kj4tRabcb3bZADw7+LbbA9EdHf9/OBQR AK4NwHbwM/oNPHwF35fyFdztYLpGfBt69HAFp5Q/wH7tUnSKhWqD426Xe95nIDolSK0f2d7yPq1u k4L9ebrqj8nuiycVCKB0T2R+XVOj+4SNSvM8mhjseb6SewnU5Ng4pEBX28D54/YTwH4I/w84R3G6 9ce2jaP4b4HpjWPEier6ItqyNEkNDWcsoYGR09Qk+1wzDlWUBV3CFCKHkqaaxgFEa9ckxTI/0sIc 2dc+wdu1rcVzgpKlYGywXCbOmnNOvDD6jc+GomMffBL4JZWUCm44ecxhDMfkXzL6UcThAC4WgYac 5ShJ4c8Zp9i5M4+kPDmXEAGhNLKIMTyyTDjp5J1hFkne4kkMH3li9zjRKLmNvP1sLxETjBuvDKga A3DGj9uAGZz/AaC0IH5+zrr1AAAAAElFTkSuQmCC X-Now-Playing: Depeche Mode's _Music For The Masses_: "Behind The Wheel" X-Hashcash: 1:23:141114:19049@debbugs.gnu.org::94YcOOI8KhP/ToAv:0000000000000000000000000000000000000000AIYD X-Hashcash: 1:23:141114:ulm@gentoo.org::HaIYD8j69ZDcNzgZ:001GEoA Date: Fri, 14 Nov 2014 05:06:35 +0100 In-Reply-To: (Lars Magne Ingebrigtsen's message of "Fri, 14 Nov 2014 05:01:38 +0100") Message-ID: User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-MailScanner-ID: 1Xp89b-00010Q-Bp X-Netfonds-MailScanner: Found to be clean X-Netfonds-MailScanner-From: larsi@gnus.org MailScanner-NULL-Check: 1416542795.73852@MNnnhp0LIT7vYxZywtkeWg X-Spam-Status: No X-Spam-Score: 0.0 (/) 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: 0.0 (/) Lars Magne Ingebrigtsen writes: > Ulrich Mueller writes: > >> The function tries to determine the version by calling: >> >> git log -1 --pretty=format:%N >> >> According to git documentation, format:%N will output "commit notes" >> which will be empty usually. Presumably, this should be format:%H, in >> order to output the commit hash. Patch is included below. > > Thanks; applied. Oops. I should have applied that to the emacs-24 branch instead. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From unknown Sat Jun 21 12:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Nov 2014 06:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed To: Lars Magne Ingebrigtsen Cc: ulm@gentoo.org, 19049@debbugs.gnu.org Reply-To: Eli Zaretskii Received: via spool by 19049-submit@debbugs.gnu.org id=B19049.141594628022982 (code B ref 19049); Fri, 14 Nov 2014 06:25:01 +0000 Received: (at 19049) by debbugs.gnu.org; 14 Nov 2014 06:24:40 +0000 Received: from localhost ([127.0.0.1]:60035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpAJA-0005yY-HM for submit@debbugs.gnu.org; Fri, 14 Nov 2014 01:24:40 -0500 Received: from mtaout26.012.net.il ([80.179.55.182]:39752) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpAJ4-0005yL-V2 for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 01:24:34 -0500 Received: from conversion-daemon.mtaout26.012.net.il by mtaout26.012.net.il (HyperSendmail v2007.08) id <0NF000F00MCM5B00@mtaout26.012.net.il> for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 08:22:52 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout26.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF000G7CN23BP10@mtaout26.012.net.il>; Fri, 14 Nov 2014 08:22:52 +0200 (IST) Date: Fri, 14 Nov 2014 08:24:29 +0200 From: Eli Zaretskii In-reply-to: X-012-Sender: halo1@inter.net.il Message-id: <8361eijo4i.fsf@gnu.org> References: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> X-Spam-Score: 1.0 (+) 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.0 (+) > From: Lars Magne Ingebrigtsen > Date: Fri, 14 Nov 2014 05:01:38 +0100 > MailScanner-NULL-Check: 1416542500.75391@gxilGrUuOUNOorim2WEIOg > Cc: 19049@debbugs.gnu.org > > Ulrich Mueller writes: > > > The function tries to determine the version by calling: > > > > git log -1 --pretty=format:%N > > > > According to git documentation, format:%N will output "commit notes" > > which will be empty usually. Presumably, this should be format:%H, in > > order to output the commit hash. Patch is included below. > > Thanks; applied. To the wrong branch again. Please backport this to the emacs-24 branch. From unknown Sat Jun 21 12:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Resent-From: Ulrich Mueller Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Nov 2014 07:20:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed To: 19049@debbugs.gnu.org Received: via spool by 19049-submit@debbugs.gnu.org id=B19049.141594959828532 (code B ref 19049); Fri, 14 Nov 2014 07:20:03 +0000 Received: (at 19049) by debbugs.gnu.org; 14 Nov 2014 07:19:58 +0000 Received: from localhost ([127.0.0.1]:60065 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpBAj-0007Q8-Rg for submit@debbugs.gnu.org; Fri, 14 Nov 2014 02:19:58 -0500 Received: from a1www.kph.uni-mainz.de ([134.93.134.1]:58637) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpBAi-0007Py-Bd for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 02:19:57 -0500 Received: from a1i15.kph.uni-mainz.de (a1i15.kph.uni-mainz.de [134.93.134.92]) by a1www.kph.uni-mainz.de (8.14.9/8.14.7) with ESMTP id sAE7JtbK012724 for <19049@debbugs.gnu.org>; Fri, 14 Nov 2014 08:19:55 +0100 Received: from a1i15.kph.uni-mainz.de (localhost [127.0.0.1]) by a1i15.kph.uni-mainz.de (8.14.8/8.14.2) with ESMTP id sAE7JsfQ002657; Fri, 14 Nov 2014 08:19:54 +0100 Received: (from ulm@localhost) by a1i15.kph.uni-mainz.de (8.14.8/8.14.8/Submit) id sAE7JsTY002653; Fri, 14 Nov 2014 08:19:54 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <21605.44314.482383.636065@a1i15.kph.uni-mainz.de> Date: Fri, 14 Nov 2014 08:19:54 +0100 In-Reply-To: References: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> X-Mailer: VM 8.2.0b under 24.3.1 (x86_64-pc-linux-gnu) From: Ulrich Mueller X-Spam-Score: -1.0 (-) 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.0 (-) Also, according to the message in commit 0abf413 (of 2014-01-11): "The Bazaar case can be discarded after the repo transition." Should that be done now? From unknown Sat Jun 21 12:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Nov 2014 07:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed To: Ulrich Mueller Cc: 19049@debbugs.gnu.org Reply-To: Eli Zaretskii Received: via spool by 19049-submit@debbugs.gnu.org id=B19049.141595077230636 (code B ref 19049); Fri, 14 Nov 2014 07:40:02 +0000 Received: (at 19049) by debbugs.gnu.org; 14 Nov 2014 07:39:32 +0000 Received: from localhost ([127.0.0.1]:60080 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpBTf-0007y4-Um for submit@debbugs.gnu.org; Fri, 14 Nov 2014 02:39:32 -0500 Received: from mtaout26.012.net.il ([80.179.55.182]:33983) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpBTc-0007xt-Ew for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 02:39:29 -0500 Received: from conversion-daemon.mtaout26.012.net.il by mtaout26.012.net.il (HyperSendmail v2007.08) id <0NF000600Q6SEX00@mtaout26.012.net.il> for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 09:37:49 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout26.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF0003KFQJ10140@mtaout26.012.net.il>; Fri, 14 Nov 2014 09:37:49 +0200 (IST) Date: Fri, 14 Nov 2014 09:39:26 +0200 From: Eli Zaretskii In-reply-to: <21605.44314.482383.636065@a1i15.kph.uni-mainz.de> X-012-Sender: halo1@inter.net.il Message-id: <83y4rei635.fsf@gnu.org> References: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> <21605.44314.482383.636065@a1i15.kph.uni-mainz.de> X-Spam-Score: 1.0 (+) 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.0 (+) > Date: Fri, 14 Nov 2014 08:19:54 +0100 > From: Ulrich Mueller > > Also, according to the message in commit 0abf413 (of 2014-01-11): > "The Bazaar case can be discarded after the repo transition." > > Should that be done now? No. The migration to git is just an experiment. We plan on going back to bzr in a month or so. From unknown Sat Jun 21 12:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Resent-From: Ulrich Mueller Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Nov 2014 08:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed To: Eli Zaretskii Cc: 19049@debbugs.gnu.org Received: via spool by 19049-submit@debbugs.gnu.org id=B19049.14159524586058 (code B ref 19049); Fri, 14 Nov 2014 08:08:01 +0000 Received: (at 19049) by debbugs.gnu.org; 14 Nov 2014 08:07:38 +0000 Received: from localhost ([127.0.0.1]:60114 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpBur-0001Zd-Cx for submit@debbugs.gnu.org; Fri, 14 Nov 2014 03:07:38 -0500 Received: from a1www.kph.uni-mainz.de ([134.93.134.1]:59202) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpBuo-0001ZU-Ml for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 03:07:35 -0500 Received: from a1i15.kph.uni-mainz.de (a1i15.kph.uni-mainz.de [134.93.134.92]) by a1www.kph.uni-mainz.de (8.14.9/8.14.7) with ESMTP id sAE87Xqd015033; Fri, 14 Nov 2014 09:07:33 +0100 Received: from a1i15.kph.uni-mainz.de (localhost [127.0.0.1]) by a1i15.kph.uni-mainz.de (8.14.8/8.14.2) with ESMTP id sAE87XOh003324; Fri, 14 Nov 2014 09:07:33 +0100 Received: (from ulm@localhost) by a1i15.kph.uni-mainz.de (8.14.8/8.14.8/Submit) id sAE87X6V003319; Fri, 14 Nov 2014 09:07:33 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Message-ID: <21605.47173.374392.454323@a1i15.kph.uni-mainz.de> Date: Fri, 14 Nov 2014 09:07:33 +0100 In-Reply-To: <83y4rei635.fsf@gnu.org> References: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> <21605.44314.482383.636065@a1i15.kph.uni-mainz.de> <83y4rei635.fsf@gnu.org> X-Mailer: VM 8.2.0b under 24.3.1 (x86_64-pc-linux-gnu) From: Ulrich Mueller X-Spam-Score: -1.0 (-) 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.0 (-) >>>>> On Fri, 14 Nov 2014, Eli Zaretskii wrote: >> Also, according to the message in commit 0abf413 (of 2014-01-11): >> "The Bazaar case can be discarded after the repo transition." >> >> Should that be done now? > No. The migration to git is just an experiment. We plan on going > back to bzr in a month or so. :-) >From 2936042bd87ef1a626578819a23c18b5e1e634b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= Date: Fri, 14 Nov 2014 09:05:02 +0100 Subject: [PATCH] Discard the Bazaar case in repository version detection * version.el (emacs-bzr-version-dirstate, emacs-bzr-version-bzr): Remove. (emacs-repository-get-version): Discard the Bazaar case. * vc/vc-bzr.el (vc-bzr-version-dirstate): Rename from emacs-bzr-version-dirstate and move from version.el to here. (vc-bzr-working-revision): Use it. --- lisp/ChangeLog | 10 ++++++++ lisp/vc/vc-bzr.el | 17 +++++++++++-- lisp/version.el | 73 +------------------------------------------------------ 3 files changed, 26 insertions(+), 74 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c3b879a..9044804 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2014-11-14 Ulrich Müller + + * version.el (emacs-bzr-version-dirstate, emacs-bzr-version-bzr): + Remove. + (emacs-repository-get-version): Discard the Bazaar case. + + * vc/vc-bzr.el (vc-bzr-version-dirstate): Rename from + emacs-bzr-version-dirstate and move from version.el to here. + (vc-bzr-working-revision): Use it. + 2014-11-14 Fabián Ezequiel Gallina * progmodes/python.el (python-shell-virtualenv-root): Rename from diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index a093bcb..3a5de22 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -496,6 +496,19 @@ in the branch repository (or whose status not be determined)." (defun vc-bzr-workfile-unchanged-p (file) (eq 'unchanged (car (vc-bzr-status file)))) +(defun vc-bzr-version-dirstate (dir) + "Try to return as a string the bzr revision ID of directory DIR. +This uses the dirstate file's parent revision entry. +Returns nil if unable to find this information." + (let ((file (expand-file-name ".bzr/checkout/dirstate" dir))) + (when (file-readable-p file) + (with-temp-buffer + (insert-file-contents file) + (and (looking-at "#bazaar dirstate flat format 3") + (forward-line 3) + (looking-at "[0-9]+\0\\([^\0\n]+\\)\0") + (match-string 1)))))) + (defun vc-bzr-working-revision (file) ;; Together with the code in vc-state-heuristic, this makes it possible ;; to get the initial VC state of a Bzr file even if Bzr is not installed. @@ -543,8 +556,8 @@ in the branch repository (or whose status not be determined)." ;; files exist. (and (file-exists-p branch-format-file) (file-exists-p lastrev-file) - (equal (emacs-bzr-version-dirstate l-c-parent-dir) - (emacs-bzr-version-dirstate rootdir)))))) + (equal (vc-bzr-version-dirstate l-c-parent-dir) + (vc-bzr-version-dirstate rootdir)))))) t))) (with-temp-buffer (insert-file-contents branch-format-file) diff --git a/lisp/version.el b/lisp/version.el index 1ea38da..410e730 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -93,41 +93,6 @@ or if we could not determine the revision.") (define-obsolete-variable-alias 'emacs-bzr-version 'emacs-repository-version "24.4") -(defun emacs-bzr-version-dirstate (dir) - "Try to return as a string the bzr revision ID of directory DIR. -This uses the dirstate file's parent revision entry. -Returns nil if unable to find this information." - (let ((file (expand-file-name ".bzr/checkout/dirstate" dir))) - (when (file-readable-p file) - (with-temp-buffer - (insert-file-contents file) - (and (looking-at "#bazaar dirstate flat format 3") - (forward-line 3) - (looking-at "[0-9]+\0\\([^\0\n]+\\)\0") - (match-string 1)))))) - -(defun emacs-bzr-version-bzr (dir) - "Ask bzr itself for the version information for directory DIR." - ;; Comments on `bzr version-info': - ;; i) Unknown files also cause clean != 1. - ;; ii) It can be slow, contacting the upstream repo to get the - ;; branch nick if one is not set locally, even with a custom - ;; template that is not asking for the nick (as used here). You'd - ;; think the latter part would be trivial to fix: - ;; https://bugs.launchpad.net/bzr/+bug/882541/comments/3 - ;; https://bugs.launchpad.net/bzr/+bug/629150 - ;; You can set the nick locally with `bzr nick ...', which speeds - ;; things up enormously. `bzr revno' does not have this issue, but - ;; has no way to print the revision_id AFAICS. - (message "Waiting for bzr...") - (with-temp-buffer - (if (zerop - (call-process "bzr" nil '(t nil) nil "version-info" - "--custom" - "--template={revno} {revision_id} (clean = {clean})" - dir)) - (buffer-string)))) - (define-obsolete-function-alias 'emacs-bzr-get-version 'emacs-repository-get-version "24.4") @@ -145,43 +110,7 @@ maybe ask the VCS itself, if the sources appear to be under version control. If `force', always ask. the VCS. Otherwise only ask the VCS if we cannot find any information ourselves." (or dir (setq dir source-directory)) - (cond ((file-directory-p (expand-file-name ".bzr/branch" dir)) - (if (eq external 'force) - (emacs-bzr-version-bzr dir) - (let (file loc rev) - (cond ((file-readable-p - (setq file (expand-file-name - ".bzr/branch/last-revision" dir))) - (with-temp-buffer - (insert-file-contents file) - (goto-char (point-max)) - (if (looking-back "\n") - (delete-char -1)) - (buffer-string))) - ;; OK, no last-revision. Is it a lightweight checkout? - ((file-readable-p - (setq file (expand-file-name ".bzr/branch/location" dir))) - (setq rev (emacs-bzr-version-dirstate dir)) - ;; If parent branch is local, try looking there for the rev. - ;; Note: there is no guarantee that the parent branch's rev - ;; corresponds to this branch. This branch could have - ;; been made with a specific -r revno argument, or the - ;; parent could have been updated since this branch was - ;; created. - ;; To try and detect this, we check the dirstate revids - ;; to see if they match. - (if (and (setq loc (with-temp-buffer - (insert-file-contents file) - (if (looking-at "file://\\(.*\\)") - (match-string 1)))) - (equal rev (emacs-bzr-version-dirstate loc))) - (emacs-repository-get-version loc) - ;; If parent does not match, the best we can do without - ;; calling external commands is to use the dirstate rev. - rev)) - (external - (emacs-bzr-version-bzr dir)))))) - ((file-directory-p (expand-file-name ".git" dir)) + (cond ((file-directory-p (expand-file-name ".git" dir)) (message "Waiting for git...") (with-temp-buffer (let ((default-directory (file-name-as-directory dir))) -- 2.1.3 From unknown Sat Jun 21 12:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Resent-From: Lars Magne Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Nov 2014 14:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed To: Eli Zaretskii Cc: 19049@debbugs.gnu.org Received: via spool by 19049-submit@debbugs.gnu.org id=B19049.141597434825086 (code B ref 19049); Fri, 14 Nov 2014 14:13:01 +0000 Received: (at 19049) by debbugs.gnu.org; 14 Nov 2014 14:12:28 +0000 Received: from localhost ([127.0.0.1]:60294 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpHbv-0006WX-DB for submit@debbugs.gnu.org; Fri, 14 Nov 2014 09:12:27 -0500 Received: from hermes.netfonds.no ([80.91.224.195]:56490) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpHbs-0006WO-Iv for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 09:12:25 -0500 Received: from cm-84.215.51.58.getinternet.no ([84.215.51.58] helo=stories.gnus.org) by hermes.netfonds.no with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1XpHbW-0004rW-SE; Fri, 14 Nov 2014 15:12:02 +0100 From: Lars Magne Ingebrigtsen References: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> <8361eijo4i.fsf@gnu.org> Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAGFBMVEX9wrjSgoc2HiwVCxX2 qaV/TVsHAQj+3NJt0xTkAAACJ0lEQVQ4jU3UwW7jIBAGYLoi4prxwu45WOS+RvHZroh6BpcniOSz D5X8+vsP4CQoqZL5wsxgjyv2fd/Ea+1iJqKcswDsJSRDEIq/hCIFeBPiWBM+MkTTQEgZpqmIaKlU hcD5d4WNM+XIkGNNLEOt3moDciaauPILyAAsLxePuAjhHez3E1AiJ0Qa6CAbnDhqe9+gnKHAR/nu G7gwZ4c2Ik0CQV7Coutkc30D9dJgQEdBzAgiilfqG3jrSIOkyWXZJwyDzZpLV2olAFiDjcR9zaD0 Dm/0VoPDnnvOXCuYNxhcsu2S8XXqX5A1LhCfd3C41Cb58VHA4iRBUiqdcs40rg/Bmb5xDtzsI70f 0sjgccJ6h+fS7Lqu3voK5zYT++b9CFhLjcHpvwfsXQWugbhS6oCt90+IKDA9wS4FVsBZiK2BVB+2 bzDeFI9l+33s3PXYceF5m7+q6H4YD0CrmKYzVO3bffGPBm5SPKEBUVyYzrUNq4iATZYHQIZ7Nv6A ACgPh9p/yNDy3KHLs4Kl1X66GT++dqDExDdVi9MFQ3V9wcYzPidHC8B1bzs41d3aaONyo3htgAv7 w0MAILKxu3xWwIzv3FRiMGRuWpYtPPmcaQYQdc7Gs/isqXAAwZl6BxguGv8KxgpCyZlQ4oLJ8f++ kOJ3hYC3Ni5FrY113P2pwoSm5s73aCr5G2HHLwY85EJqWnCLif9qHOBPg2nm3w6YW48dkyT0O/4H zpEGCj95YicAAAAASUVORK5CYII= X-Now-Playing: Joni Mitchell's _Chalk Mark In A Rain Storm_: "The Beat of Black Wings" X-Hashcash: 1:23:141114:eliz@gnu.org::+PLsK0yYlEZHsLFm:00000bVbn X-Hashcash: 1:23:141114:ulm@gentoo.org::sUpeZvQiv4Wwa4xY:001IXio X-Hashcash: 1:23:141114:19049@debbugs.gnu.org::Yu+3JwG2NdhXDofE:0000000000000000000000000000000000000000yi4R Date: Fri, 14 Nov 2014 15:12:02 +0100 In-Reply-To: <8361eijo4i.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 14 Nov 2014 08:24:29 +0200") Message-ID: User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-MailScanner-ID: 1XpHbW-0004rW-SE X-Netfonds-MailScanner: Found to be clean X-Netfonds-MailScanner-From: larsi@gnus.org MailScanner-NULL-Check: 1416579123.86734@cEe2dRWIGBPJXAtSfjfVhw X-Spam-Status: No X-Spam-Score: 0.0 (/) 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: 0.0 (/) Eli Zaretskii writes: > To the wrong branch again. Please backport this to the emacs-24 > branch. I would if I knew how. admin/repo says ---- * Backporting a bug-fix from the trunk to a branch (e.g. "emacs-24"). Indicate in the commit log that there is no need to merge the commit to the trunk, e.g. start the commit message with "Backport:". This is helpful for the person merging the release branch to the trunk. http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00262.html * How to merge changes from emacs-24 to trunk [The section on git merge procedure has not yet been written] ---- neither of which helps, and the Emacs for Git Devs wiki doesn't say how to cherry-pick stuff, either. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From unknown Sat Jun 21 12:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Nov 2014 14:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed To: Lars Magne Ingebrigtsen Cc: Eli Zaretskii , 19049@debbugs.gnu.org Received: via spool by 19049-submit@debbugs.gnu.org id=B19049.141597463625590 (code B ref 19049); Fri, 14 Nov 2014 14:18:02 +0000 Received: (at 19049) by debbugs.gnu.org; 14 Nov 2014 14:17:16 +0000 Received: from localhost ([127.0.0.1]:60298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpHgV-0006eY-Ml for submit@debbugs.gnu.org; Fri, 14 Nov 2014 09:17:15 -0500 Received: from mail-wi0-f171.google.com ([209.85.212.171]:63868) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpHgP-0006eM-HS for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 09:17:09 -0500 Received: by mail-wi0-f171.google.com with SMTP id r20so2839405wiv.4 for <19049@debbugs.gnu.org>; Fri, 14 Nov 2014 06:17:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; bh=jPAADORygQvbvhM+SRuqbUZO5AWVldqy2e//Y7Hn0Q0=; b=fIps9ZjRlByYx66Yz6Iwlwosci+IKn2KMbvxugr40fgY040g99Q6K6gu0SeyPRLrVF HXXg9UbhaS0RwHCNtodIlSIqRF/+gRBI69nNQ3t67rrulELFdvcFBB6x4DEtzMRU0GDd b/1olVZElQgfHE//JNXwI6ufY8bE888AeeS37AR+odVrG6hWfHHu3i4QBN2FLPc4wcuO cEEvALMZMaNt3Ap1bJzSCGvTGMzoNeoU//SNeR2iL5HFEuJdqHloed8lu/OdGGIvalYC yjRLMOi2Wdulq/J9QfNGTkF1EkMnsaitmMMjFoYYEckTt20Y7yxcjxcjXQSFk6VoMBBu SArQ== X-Received: by 10.194.2.244 with SMTP id 20mr14591361wjx.4.1415974624935; Fri, 14 Nov 2014 06:17:04 -0800 (PST) Received: from axl (static-nbl2-118.cytanet.com.cy. [212.31.107.118]) by mx.google.com with ESMTPSA id w4sm10713937wjw.39.2014.11.14.06.17.03 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 14 Nov 2014 06:17:04 -0800 (PST) From: Dmitry Gutov References: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> <8361eijo4i.fsf@gnu.org> Date: Fri, 14 Nov 2014 16:17:01 +0200 In-Reply-To: (Lars Magne Ingebrigtsen's message of "Fri, 14 Nov 2014 15:12:02 +0100") Message-ID: <86zjbt6f4y.fsf@yandex.ru> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.51 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) 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: -0.7 (/) Lars Magne Ingebrigtsen writes: > neither of which helps, and the Emacs for Git Devs wiki doesn't say how > to cherry-pick stuff, either. Have you tried 'git cherry-pick '? Seems rather obvious, doesn't it? From unknown Sat Jun 21 12:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Resent-From: Lars Magne Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Nov 2014 14:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed To: Dmitry Gutov Cc: Eli Zaretskii , 19049@debbugs.gnu.org Received: via spool by 19049-submit@debbugs.gnu.org id=B19049.141597499126170 (code B ref 19049); Fri, 14 Nov 2014 14:24:01 +0000 Received: (at 19049) by debbugs.gnu.org; 14 Nov 2014 14:23:11 +0000 Received: from localhost ([127.0.0.1]:60302 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpHmF-0006nw-BE for submit@debbugs.gnu.org; Fri, 14 Nov 2014 09:23:11 -0500 Received: from hermes.netfonds.no ([80.91.224.195]:58100) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpHm9-0006nO-Dy for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 09:23:05 -0500 Received: from cm-84.215.51.58.getinternet.no ([84.215.51.58] helo=stories.gnus.org) by hermes.netfonds.no with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1XpHln-0005Ah-Cj; Fri, 14 Nov 2014 15:22:39 +0100 From: Lars Magne Ingebrigtsen References: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> <8361eijo4i.fsf@gnu.org> <86zjbt6f4y.fsf@yandex.ru> Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAGFBMVEX9wrjSgoc2HiwVCxX2 qaV/TVsHAQj+3NJt0xTkAAACJ0lEQVQ4jU3UwW7jIBAGYLoi4prxwu45WOS+RvHZroh6BpcniOSz D5X8+vsP4CQoqZL5wsxgjyv2fd/Ea+1iJqKcswDsJSRDEIq/hCIFeBPiWBM+MkTTQEgZpqmIaKlU hcD5d4WNM+XIkGNNLEOt3moDciaauPILyAAsLxePuAjhHez3E1AiJ0Qa6CAbnDhqe9+gnKHAR/nu G7gwZ4c2Ik0CQV7Coutkc30D9dJgQEdBzAgiilfqG3jrSIOkyWXZJwyDzZpLV2olAFiDjcR9zaD0 Dm/0VoPDnnvOXCuYNxhcsu2S8XXqX5A1LhCfd3C41Cb58VHA4iRBUiqdcs40rg/Bmb5xDtzsI70f 0sjgccJ6h+fS7Lqu3voK5zYT++b9CFhLjcHpvwfsXQWugbhS6oCt90+IKDA9wS4FVsBZiK2BVB+2 bzDeFI9l+33s3PXYceF5m7+q6H4YD0CrmKYzVO3bffGPBm5SPKEBUVyYzrUNq4iATZYHQIZ7Nv6A ACgPh9p/yNDy3KHLs4Kl1X66GT++dqDExDdVi9MFQ3V9wcYzPidHC8B1bzs41d3aaONyo3htgAv7 w0MAILKxu3xWwIzv3FRiMGRuWpYtPPmcaQYQdc7Gs/isqXAAwZl6BxguGv8KxgpCyZlQ4oLJ8f++ kOJ3hYC3Ni5FrY113P2pwoSm5s73aCr5G2HHLwY85EJqWnCLif9qHOBPg2nm3w6YW48dkyT0O/4H zpEGCj95YicAAAAASUVORK5CYII= X-Now-Playing: Joni Mitchell's _Chalk Mark In A Rain Storm_: "The Beat of Black Wings" X-Hashcash: 1:23:141114:19049@debbugs.gnu.org::ofXo0uABrFm9GCWS:00000000000000000000000000000000000000005K1M X-Hashcash: 1:23:141114:eliz@gnu.org::p77VB176xAeyYvEd:000000uob X-Hashcash: 1:23:141114:dgutov@yandex.ru::NYz68BXzm935patc:0ORZh Date: Fri, 14 Nov 2014 15:22:39 +0100 In-Reply-To: <86zjbt6f4y.fsf@yandex.ru> (Dmitry Gutov's message of "Fri, 14 Nov 2014 16:17:01 +0200") Message-ID: User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-MailScanner-ID: 1XpHln-0005Ah-Cj X-Netfonds-MailScanner: Found to be clean X-Netfonds-MailScanner-From: larsi@gnus.org MailScanner-NULL-Check: 1416579760.28254@vvQUXDbClYWOFMGy0ppJiw X-Spam-Status: No X-Spam-Score: 0.0 (/) 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: 0.0 (/) Dmitry Gutov writes: > Lars Magne Ingebrigtsen writes: > >> neither of which helps, and the Emacs for Git Devs wiki doesn't say how >> to cherry-pick stuff, either. > > Have you tried 'git cherry-pick '? Seems rather obvious, doesn't it? It's funny how everything is obvious after you know what how to do something? Thanks, I think that worked... -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From unknown Sat Jun 21 12:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Resent-From: Lars Magne Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Nov 2014 14:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed To: Dmitry Gutov Cc: Eli Zaretskii , 19049@debbugs.gnu.org Received: via spool by 19049-submit@debbugs.gnu.org id=B19049.141597516226459 (code B ref 19049); Fri, 14 Nov 2014 14:27:02 +0000 Received: (at 19049) by debbugs.gnu.org; 14 Nov 2014 14:26:02 +0000 Received: from localhost ([127.0.0.1]:60306 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpHp3-0006sZ-Fk for submit@debbugs.gnu.org; Fri, 14 Nov 2014 09:26:01 -0500 Received: from hermes.netfonds.no ([80.91.224.195]:36874) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpHp0-0006sR-GN for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 09:25:58 -0500 Received: from cm-84.215.51.58.getinternet.no ([84.215.51.58] helo=stories.gnus.org) by hermes.netfonds.no with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1XpHoi-0005En-Nm; Fri, 14 Nov 2014 15:25:40 +0100 From: Lars Magne Ingebrigtsen References: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> <8361eijo4i.fsf@gnu.org> <86zjbt6f4y.fsf@yandex.ru> Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAGFBMVEX9wrjSgoc2HiwVCxX2 qaV/TVsHAQj+3NJt0xTkAAACJ0lEQVQ4jU3UwW7jIBAGYLoi4prxwu45WOS+RvHZroh6BpcniOSz D5X8+vsP4CQoqZL5wsxgjyv2fd/Ea+1iJqKcswDsJSRDEIq/hCIFeBPiWBM+MkTTQEgZpqmIaKlU hcD5d4WNM+XIkGNNLEOt3moDciaauPILyAAsLxePuAjhHez3E1AiJ0Qa6CAbnDhqe9+gnKHAR/nu G7gwZ4c2Ik0CQV7Coutkc30D9dJgQEdBzAgiilfqG3jrSIOkyWXZJwyDzZpLV2olAFiDjcR9zaD0 Dm/0VoPDnnvOXCuYNxhcsu2S8XXqX5A1LhCfd3C41Cb58VHA4iRBUiqdcs40rg/Bmb5xDtzsI70f 0sjgccJ6h+fS7Lqu3voK5zYT++b9CFhLjcHpvwfsXQWugbhS6oCt90+IKDA9wS4FVsBZiK2BVB+2 bzDeFI9l+33s3PXYceF5m7+q6H4YD0CrmKYzVO3bffGPBm5SPKEBUVyYzrUNq4iATZYHQIZ7Nv6A ACgPh9p/yNDy3KHLs4Kl1X66GT++dqDExDdVi9MFQ3V9wcYzPidHC8B1bzs41d3aaONyo3htgAv7 w0MAILKxu3xWwIzv3FRiMGRuWpYtPPmcaQYQdc7Gs/isqXAAwZl6BxguGv8KxgpCyZlQ4oLJ8f++ kOJ3hYC3Ni5FrY113P2pwoSm5s73aCr5G2HHLwY85EJqWnCLif9qHOBPg2nm3w6YW48dkyT0O/4H zpEGCj95YicAAAAASUVORK5CYII= X-Now-Playing: Joni Mitchell's _Chalk Mark In A Rain Storm_: "The Beat of Black Wings" X-Hashcash: 1:23:141114:eliz@gnu.org::UeHHeWmEMFVbfqGo:000006bTP X-Hashcash: 1:23:141114:dgutov@yandex.ru::AX2VSSLtYx4heO67:0MK1t X-Hashcash: 1:23:141114:19049@debbugs.gnu.org::1Hc8Y2em7r3meVMn:0000000000000000000000000000000000000000QRz/ Date: Fri, 14 Nov 2014 15:25:40 +0100 In-Reply-To: <86zjbt6f4y.fsf@yandex.ru> (Dmitry Gutov's message of "Fri, 14 Nov 2014 16:17:01 +0200") Message-ID: User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-MailScanner-ID: 1XpHoi-0005En-Nm X-Netfonds-MailScanner: Found to be clean X-Netfonds-MailScanner-From: larsi@gnus.org MailScanner-NULL-Check: 1416579940.97115@7iZOZVGnBUxMtn9cKZNRAQ X-Spam-Status: No X-Spam-Score: 0.0 (/) 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: 0.0 (/) Argh! But now my backported change didn't get marked with "Backport:" as per admin/notes. Or is that outdated information? I just did larsi@stories ~/src/24-emacs]$ git cherry-pick 7169391ddb735892a8463aa96407= e0448a3820a0 [emacs-24 df33e85] (emacs-repository-get-version): Call `git log' with prop= er format argument Author: Ulrich M=C3=BCller 2 files changed, 6 insertions(+), 1 deletion(-) [larsi@stories ~/src/24-emacs]$ git push Counting objects: 9, done. Delta compression using up to 4 threads. Compressing objects: 100% (5/5), done. Writing objects: 100% (5/5), 671 bytes, done. Total 5 (delta 4), reused 0 (delta 0) remote: Sending notification emails to: emacs-diffs@gnu.org To larsi@git.sv.gnu.org:/srv/git/emacs.git 6a079d5..df33e85 emacs-24 -> emacs-24 Not really a step where I could put "Backport:" anywhere... --=20 (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From unknown Sat Jun 21 12:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Nov 2014 14:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed To: Lars Magne Ingebrigtsen Cc: Eli Zaretskii , 19049@debbugs.gnu.org Received: via spool by 19049-submit@debbugs.gnu.org id=B19049.141597585527548 (code B ref 19049); Fri, 14 Nov 2014 14:38:02 +0000 Received: (at 19049) by debbugs.gnu.org; 14 Nov 2014 14:37:35 +0000 Received: from localhost ([127.0.0.1]:60315 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpI0E-0007AG-N4 for submit@debbugs.gnu.org; Fri, 14 Nov 2014 09:37:34 -0500 Received: from mail-wg0-f46.google.com ([74.125.82.46]:57869) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpI0B-0007A4-5U for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 09:37:31 -0500 Received: by mail-wg0-f46.google.com with SMTP id x13so19726664wgg.5 for <19049@debbugs.gnu.org>; Fri, 14 Nov 2014 06:37:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=Ydw8KgKsHwJ0q+yDVMTHu6TURHU/0I3eHZ95g2DP77I=; b=jhJADPjjdLAPk59JWKF+MGGXFQFfvz8iwBbguEKeM3zieOOwc6KGUsUMQFAXCC3XEm yQ526TOUpM8FLS0ZmioD8DGSZv3PKQzRspa1nEISKQ2n9vbYgzVcpeAkMWR1QhDVrBUb XljOh7r0r8AkhI282X9xSNR4pDwW91T5DJQFKJT72PzEf0egAQ2uYWaz6jI19dPaA4xR MkuWL264i8LEoE/C8EMIazzF30JTPgBk7L03Xazx9Qlmn/pPdo5qeEeC+QFc0SWGMqQU yTTcjqQgE7WQvfJIohce3lre2H2xTY58ddsD588Va6Shfh/JN663iZ4CthfLdTDiQqFN 7uxw== X-Received: by 10.194.81.70 with SMTP id y6mr13747886wjx.113.1415975850332; Fri, 14 Nov 2014 06:37:30 -0800 (PST) Received: from [192.168.0.185] (static-nbl2-118.cytanet.com.cy. [212.31.107.118]) by mx.google.com with ESMTPSA id mw7sm3666249wib.14.2014.11.14.06.37.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Nov 2014 06:37:29 -0800 (PST) Message-ID: <546613A7.6010803@yandex.ru> Date: Fri, 14 Nov 2014 16:37:27 +0200 From: Dmitry Gutov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 References: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> <8361eijo4i.fsf@gnu.org> <86zjbt6f4y.fsf@yandex.ru> In-Reply-To: Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) 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: -0.7 (/) On 11/14/2014 04:25 PM, Lars Magne Ingebrigtsen wrote: > Argh! But now my backported change didn't get marked with "Backport:" > as per admin/notes. Err, you'd need to change the commit message, of course. Either with a separate step of 'git commit --amend', or by passing '-e' to 'git cherry-pick' (just found about it by reading the man page). From unknown Sat Jun 21 12:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Resent-From: Lars Magne Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Nov 2014 14:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed To: Dmitry Gutov Cc: Eli Zaretskii , 19049@debbugs.gnu.org Received: via spool by 19049-submit@debbugs.gnu.org id=B19049.141597611527980 (code B ref 19049); Fri, 14 Nov 2014 14:42:01 +0000 Received: (at 19049) by debbugs.gnu.org; 14 Nov 2014 14:41:55 +0000 Received: from localhost ([127.0.0.1]:60320 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpI4Q-0007HD-9Q for submit@debbugs.gnu.org; Fri, 14 Nov 2014 09:41:54 -0500 Received: from hermes.netfonds.no ([80.91.224.195]:35890) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpI4M-0007Gz-H1 for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 09:41:51 -0500 Received: from cm-84.215.51.58.getinternet.no ([84.215.51.58] helo=stories.gnus.org) by hermes.netfonds.no with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1XpI3w-0005fL-BD; Fri, 14 Nov 2014 15:41:24 +0100 From: Lars Magne Ingebrigtsen References: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> <8361eijo4i.fsf@gnu.org> <86zjbt6f4y.fsf@yandex.ru> <546613A7.6010803@yandex.ru> Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAGFBMVEX9wrjSgoc2HiwVCxX2 qaV/TVsHAQj+3NJt0xTkAAACJ0lEQVQ4jU3UwW7jIBAGYLoi4prxwu45WOS+RvHZroh6BpcniOSz D5X8+vsP4CQoqZL5wsxgjyv2fd/Ea+1iJqKcswDsJSRDEIq/hCIFeBPiWBM+MkTTQEgZpqmIaKlU hcD5d4WNM+XIkGNNLEOt3moDciaauPILyAAsLxePuAjhHez3E1AiJ0Qa6CAbnDhqe9+gnKHAR/nu G7gwZ4c2Ik0CQV7Coutkc30D9dJgQEdBzAgiilfqG3jrSIOkyWXZJwyDzZpLV2olAFiDjcR9zaD0 Dm/0VoPDnnvOXCuYNxhcsu2S8XXqX5A1LhCfd3C41Cb58VHA4iRBUiqdcs40rg/Bmb5xDtzsI70f 0sjgccJ6h+fS7Lqu3voK5zYT++b9CFhLjcHpvwfsXQWugbhS6oCt90+IKDA9wS4FVsBZiK2BVB+2 bzDeFI9l+33s3PXYceF5m7+q6H4YD0CrmKYzVO3bffGPBm5SPKEBUVyYzrUNq4iATZYHQIZ7Nv6A ACgPh9p/yNDy3KHLs4Kl1X66GT++dqDExDdVi9MFQ3V9wcYzPidHC8B1bzs41d3aaONyo3htgAv7 w0MAILKxu3xWwIzv3FRiMGRuWpYtPPmcaQYQdc7Gs/isqXAAwZl6BxguGv8KxgpCyZlQ4oLJ8f++ kOJ3hYC3Ni5FrY113P2pwoSm5s73aCr5G2HHLwY85EJqWnCLif9qHOBPg2nm3w6YW48dkyT0O/4H zpEGCj95YicAAAAASUVORK5CYII= X-Now-Playing: Joni Mitchell's _Chalk Mark In A Rain Storm_: "The Beat of Black Wings" X-Hashcash: 1:23:141114:dgutov@yandex.ru::tvrLZCRjdjBxTH9P:02Cbd X-Hashcash: 1:23:141114:eliz@gnu.org::1NX5R7QvxBi0+iAw:000004foK X-Hashcash: 1:23:141114:19049@debbugs.gnu.org::IB2M/l3vjOhgPvNG:0000000000000000000000000000000000000000SeM6 Date: Fri, 14 Nov 2014 15:41:24 +0100 In-Reply-To: <546613A7.6010803@yandex.ru> (Dmitry Gutov's message of "Fri, 14 Nov 2014 16:37:27 +0200") Message-ID: User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-MailScanner-ID: 1XpI3w-0005fL-BD X-Netfonds-MailScanner: Found to be clean X-Netfonds-MailScanner-From: larsi@gnus.org MailScanner-NULL-Check: 1416580885.88863@TFJQB74KieFT/ql6bVadPw X-Spam-Status: No X-Spam-Score: 0.0 (/) 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: 0.0 (/) Dmitry Gutov writes: > On 11/14/2014 04:25 PM, Lars Magne Ingebrigtsen wrote: >> Argh! But now my backported change didn't get marked with "Backport:" >> as per admin/notes. > > Err, you'd need to change the commit message, of course. > > Either with a separate step of 'git commit --amend', or by passing > '-e' to 'git cherry-pick' (just found about it by reading the man > page). Of course. >"? -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From unknown Sat Jun 21 12:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Nov 2014 14:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed To: Lars Magne Ingebrigtsen Cc: 19049@debbugs.gnu.org Reply-To: Eli Zaretskii Received: via spool by 19049-submit@debbugs.gnu.org id=B19049.141597646728591 (code B ref 19049); Fri, 14 Nov 2014 14:48:01 +0000 Received: (at 19049) by debbugs.gnu.org; 14 Nov 2014 14:47:47 +0000 Received: from localhost ([127.0.0.1]:60324 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpIA3-0007R2-Dx for submit@debbugs.gnu.org; Fri, 14 Nov 2014 09:47:47 -0500 Received: from mtaout27.012.net.il ([80.179.55.183]:34777) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpI9w-0007Qi-V3 for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 09:47:41 -0500 Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0NF100D009X93I00@mtaout27.012.net.il> for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 16:42:50 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF100AKHA7E8X30@mtaout27.012.net.il>; Fri, 14 Nov 2014 16:42:50 +0200 (IST) Date: Fri, 14 Nov 2014 16:47:26 +0200 From: Eli Zaretskii In-reply-to: X-012-Sender: halo1@inter.net.il Message-id: <83fvdlj0u9.fsf@gnu.org> References: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> <8361eijo4i.fsf@gnu.org> X-Spam-Score: 1.0 (+) 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.0 (+) > From: Lars Magne Ingebrigtsen > Cc: 19049@debbugs.gnu.org > Date: Fri, 14 Nov 2014 15:12:02 +0100 > > Eli Zaretskii writes: > > > To the wrong branch again. Please backport this to the emacs-24 > > branch. > > I would if I knew how. Just commit the same changes to the branch and mention "backported" in the commit message. > admin/repo says > > ---- > > * Backporting a bug-fix from the trunk to a branch (e.g. "emacs-24"). > > Indicate in the commit log that there is no need to merge the commit > to the trunk, e.g. start the commit message with "Backport:". This is > helpful for the person merging the release branch to the trunk. > > http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00262.html > > * How to merge changes from emacs-24 to trunk > > [The section on git merge procedure has not yet been written] > > ---- > > neither of which helps, and the Emacs for Git Devs wiki doesn't say how > to cherry-pick stuff, either. Where were you 10 months ago, when I wrote that this is what will happen, if the instructions are left at what was written back then? If some of those who are mightily confused now, as I predicted they will be, supported what I said back then, perhaps we could have had enough leverage to insist on better write-ups. But nooo! everyone who cared to reply claimed that this is all either obvious or too personal to describe, and some even said I'm a "bullshitter". Now you-all get to learn this stuff the hard way. From unknown Sat Jun 21 12:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Nov 2014 14:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed To: Dmitry Gutov Cc: larsi@gnus.org, 19049@debbugs.gnu.org Reply-To: Eli Zaretskii Received: via spool by 19049-submit@debbugs.gnu.org id=B19049.141597664928933 (code B ref 19049); Fri, 14 Nov 2014 14:51:02 +0000 Received: (at 19049) by debbugs.gnu.org; 14 Nov 2014 14:50:49 +0000 Received: from localhost ([127.0.0.1]:60336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpICy-0007WQ-S9 for submit@debbugs.gnu.org; Fri, 14 Nov 2014 09:50:48 -0500 Received: from mtaout20.012.net.il ([80.179.55.166]:42796) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpICs-0007WA-MJ for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 09:50:43 -0500 Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NF1009009W1X400@a-mtaout20.012.net.il> for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 16:50:37 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF1009ZPAKCFV80@a-mtaout20.012.net.il>; Fri, 14 Nov 2014 16:50:37 +0200 (IST) Date: Fri, 14 Nov 2014 16:50:28 +0200 From: Eli Zaretskii In-reply-to: <86zjbt6f4y.fsf@yandex.ru> X-012-Sender: halo1@inter.net.il Message-id: <83egt5j0p7.fsf@gnu.org> References: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> <8361eijo4i.fsf@gnu.org> <86zjbt6f4y.fsf@yandex.ru> X-Spam-Score: 1.0 (+) 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.0 (+) > From: Dmitry Gutov > Cc: Eli Zaretskii , 19049@debbugs.gnu.org > Date: Fri, 14 Nov 2014 16:17:01 +0200 > > Lars Magne Ingebrigtsen writes: > > > neither of which helps, and the Emacs for Git Devs wiki doesn't say how > > to cherry-pick stuff, either. > > Have you tried 'git cherry-pick '? Seems rather obvious, doesn't it? No, it isn't obvious if you never did that before. More importantly, it's not the way changes should be backported, because cherry-pick also commits reusing the same commit message, as Lars has just discovered, which is bad. From unknown Sat Jun 21 12:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Nov 2014 14:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed To: Lars Magne Ingebrigtsen Cc: 19049@debbugs.gnu.org, dgutov@yandex.ru Reply-To: Eli Zaretskii Received: via spool by 19049-submit@debbugs.gnu.org id=B19049.141597674529114 (code B ref 19049); Fri, 14 Nov 2014 14:53:01 +0000 Received: (at 19049) by debbugs.gnu.org; 14 Nov 2014 14:52:25 +0000 Received: from localhost ([127.0.0.1]:60341 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpIEY-0007ZP-1f for submit@debbugs.gnu.org; Fri, 14 Nov 2014 09:52:25 -0500 Received: from mtaout23.012.net.il ([80.179.55.175]:35561) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpIET-0007ZC-Bp for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 09:52:21 -0500 Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0NF100D00AIVI500@a-mtaout23.012.net.il> for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 16:52:16 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF100DKJAN3HH10@a-mtaout23.012.net.il>; Fri, 14 Nov 2014 16:52:16 +0200 (IST) Date: Fri, 14 Nov 2014 16:52:07 +0200 From: Eli Zaretskii In-reply-to: X-012-Sender: halo1@inter.net.il Message-id: <83d28pj0mg.fsf@gnu.org> References: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> <8361eijo4i.fsf@gnu.org> <86zjbt6f4y.fsf@yandex.ru> X-Spam-Score: 1.0 (+) 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.0 (+) > From: Lars Magne Ingebrigtsen > Cc: Eli Zaretskii , 19049@debbugs.gnu.org > Date: Fri, 14 Nov 2014 15:25:40 +0100 > > Argh! But now my backported change didn't get marked with "Backport:" > as per admin/notes. > > Or is that outdated information? No, it isn't outdated. We haven't yet given up on having gitmerge.el similar to bzrmerge.el, although I don't see anybody (besides Glenn) who cares. From unknown Sat Jun 21 12:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Nov 2014 14:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed To: Dmitry Gutov Cc: larsi@gnus.org, 19049@debbugs.gnu.org Reply-To: Eli Zaretskii Received: via spool by 19049-submit@debbugs.gnu.org id=B19049.141597677729163 (code B ref 19049); Fri, 14 Nov 2014 14:53:02 +0000 Received: (at 19049) by debbugs.gnu.org; 14 Nov 2014 14:52:57 +0000 Received: from localhost ([127.0.0.1]:60344 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpIF6-0007aI-VN for submit@debbugs.gnu.org; Fri, 14 Nov 2014 09:52:57 -0500 Received: from mtaout28.012.net.il ([80.179.55.184]:47358) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpIF4-0007a7-3O for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 09:52:55 -0500 Received: from conversion-daemon.mtaout28.012.net.il by mtaout28.012.net.il (HyperSendmail v2007.08) id <0NF100300A19VF00@mtaout28.012.net.il> for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 16:50:11 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout28.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF100PYJAJM0340@mtaout28.012.net.il>; Fri, 14 Nov 2014 16:50:11 +0200 (IST) Date: Fri, 14 Nov 2014 16:52:44 +0200 From: Eli Zaretskii In-reply-to: <546613A7.6010803@yandex.ru> X-012-Sender: halo1@inter.net.il Message-id: <83bno9j0lf.fsf@gnu.org> References: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> <8361eijo4i.fsf@gnu.org> <86zjbt6f4y.fsf@yandex.ru> <546613A7.6010803@yandex.ru> X-Spam-Score: 1.0 (+) 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.0 (+) > Date: Fri, 14 Nov 2014 16:37:27 +0200 > From: Dmitry Gutov > CC: Eli Zaretskii , 19049@debbugs.gnu.org > > On 11/14/2014 04:25 PM, Lars Magne Ingebrigtsen wrote: > > Argh! But now my backported change didn't get marked with "Backport:" > > as per admin/notes. > > Err, you'd need to change the commit message, of course. > > Either with a separate step of 'git commit --amend', or by passing '-e' > to 'git cherry-pick' (just found about it by reading the man page). There goes the "obvious" part. From unknown Sat Jun 21 12:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Nov 2014 14:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed To: Eli Zaretskii Cc: larsi@gnus.org, 19049@debbugs.gnu.org Received: via spool by 19049-submit@debbugs.gnu.org id=B19049.141597708730052 (code B ref 19049); Fri, 14 Nov 2014 14:59:01 +0000 Received: (at 19049) by debbugs.gnu.org; 14 Nov 2014 14:58:07 +0000 Received: from localhost ([127.0.0.1]:60846 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpIK7-0007oe-1x for submit@debbugs.gnu.org; Fri, 14 Nov 2014 09:58:07 -0500 Received: from mail-wg0-f52.google.com ([74.125.82.52]:38221) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpIK4-0007oU-Cj for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 09:58:05 -0500 Received: by mail-wg0-f52.google.com with SMTP id b13so19404338wgh.11 for <19049@debbugs.gnu.org>; Fri, 14 Nov 2014 06:58:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=TzBD5NrecsOcNFbs+AauXmZcalVZg1MPjClfDIo1Fhc=; b=FWw28CZGHhFxdXApijxN+2rTNcdKnrhjgbwaap6kdCr82ycBWOry3NZxdPi7J+7/eh aXjY6a5EHHm/teXGt1AaNdvDQN57kWBf0Rj8ESbXh6n93IE+i8SrvWXICq7diH9ibko7 37GqF+K6VjcPD+qJVa2z7f9Mq908IY7CQgOqN/7Nqpm1RCIIQImsQEflP8Gu8aVjMrFc 8fVeCO3/2yi8lRWANXrJ7hpKfJmuAp7w+Wz9MyLQzIZ4+zv06HHOtPU9P/XdYNt3n9jC hqWhvhVDmeMpMdam2piymrpkQQ82p9tFeg30zXV2786QTSDdGvGKfGcYCylkfWbnvOmh 9vuw== X-Received: by 10.180.86.198 with SMTP id r6mr8360473wiz.29.1415977083629; Fri, 14 Nov 2014 06:58:03 -0800 (PST) Received: from [192.168.0.185] (static-nbl2-118.cytanet.com.cy. [212.31.107.118]) by mx.google.com with ESMTPSA id d14sm39943881wjz.26.2014.11.14.06.58.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Nov 2014 06:58:03 -0800 (PST) Message-ID: <54661879.8070708@yandex.ru> Date: Fri, 14 Nov 2014 16:58:01 +0200 From: Dmitry Gutov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 References: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> <8361eijo4i.fsf@gnu.org> <86zjbt6f4y.fsf@yandex.ru> <546613A7.6010803@yandex.ru> <83bno9j0lf.fsf@gnu.org> In-Reply-To: <83bno9j0lf.fsf@gnu.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) 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: -0.7 (/) On 11/14/2014 04:52 PM, Eli Zaretskii wrote: >> Either with a separate step of 'git commit --amend', or by passing '-e' >> to 'git cherry-pick' (just found about it by reading the man page). > > There goes the "obvious" part. It just requires a bit more thought, in order to realize that Git won't exactly add anything to the commit message, just because it's an Emacs convention. Sorry, as a Git user, I'm quite used to doing some history rewriting before doing push. I suppose others will get used to it, too. From unknown Sat Jun 21 12:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Resent-From: Lars Magne Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Nov 2014 15:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed To: Eli Zaretskii Cc: 19049@debbugs.gnu.org Received: via spool by 19049-submit@debbugs.gnu.org id=B19049.141597719930229 (code B ref 19049); Fri, 14 Nov 2014 15:00:02 +0000 Received: (at 19049) by debbugs.gnu.org; 14 Nov 2014 14:59:59 +0000 Received: from localhost ([127.0.0.1]:60850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpILu-0007rU-HQ for submit@debbugs.gnu.org; Fri, 14 Nov 2014 09:59:58 -0500 Received: from hermes.netfonds.no ([80.91.224.195]:38120) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpILr-0007rC-Ep for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 09:59:56 -0500 Received: from cm-84.215.51.58.getinternet.no ([84.215.51.58] helo=stories.gnus.org) by hermes.netfonds.no with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1XpILZ-0006CW-UC; Fri, 14 Nov 2014 15:59:37 +0100 From: Lars Magne Ingebrigtsen References: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> <8361eijo4i.fsf@gnu.org> <83fvdlj0u9.fsf@gnu.org> Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAGFBMVEX9wrjSgoc2HiwVCxX2 qaV/TVsHAQj+3NJt0xTkAAACJ0lEQVQ4jU3UwW7jIBAGYLoi4prxwu45WOS+RvHZroh6BpcniOSz D5X8+vsP4CQoqZL5wsxgjyv2fd/Ea+1iJqKcswDsJSRDEIq/hCIFeBPiWBM+MkTTQEgZpqmIaKlU hcD5d4WNM+XIkGNNLEOt3moDciaauPILyAAsLxePuAjhHez3E1AiJ0Qa6CAbnDhqe9+gnKHAR/nu G7gwZ4c2Ik0CQV7Coutkc30D9dJgQEdBzAgiilfqG3jrSIOkyWXZJwyDzZpLV2olAFiDjcR9zaD0 Dm/0VoPDnnvOXCuYNxhcsu2S8XXqX5A1LhCfd3C41Cb58VHA4iRBUiqdcs40rg/Bmb5xDtzsI70f 0sjgccJ6h+fS7Lqu3voK5zYT++b9CFhLjcHpvwfsXQWugbhS6oCt90+IKDA9wS4FVsBZiK2BVB+2 bzDeFI9l+33s3PXYceF5m7+q6H4YD0CrmKYzVO3bffGPBm5SPKEBUVyYzrUNq4iATZYHQIZ7Nv6A ACgPh9p/yNDy3KHLs4Kl1X66GT++dqDExDdVi9MFQ3V9wcYzPidHC8B1bzs41d3aaONyo3htgAv7 w0MAILKxu3xWwIzv3FRiMGRuWpYtPPmcaQYQdc7Gs/isqXAAwZl6BxguGv8KxgpCyZlQ4oLJ8f++ kOJ3hYC3Ni5FrY113P2pwoSm5s73aCr5G2HHLwY85EJqWnCLif9qHOBPg2nm3w6YW48dkyT0O/4H zpEGCj95YicAAAAASUVORK5CYII= X-Now-Playing: Joni Mitchell's _Chalk Mark In A Rain Storm_: "The Beat of Black Wings" X-Hashcash: 1:23:141114:19049@debbugs.gnu.org::BHrSbDxSPITZbu2X:00000000000000000000000000000000000000007L5P X-Hashcash: 1:23:141114:eliz@gnu.org::52OOO1KCkebcJnHS:00000e5ca Date: Fri, 14 Nov 2014 15:59:37 +0100 In-Reply-To: <83fvdlj0u9.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 14 Nov 2014 16:47:26 +0200") Message-ID: User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-MailScanner-ID: 1XpILZ-0006CW-UC X-Netfonds-MailScanner: Found to be clean X-Netfonds-MailScanner-From: larsi@gnus.org MailScanner-NULL-Check: 1416581978.04701@pbumvecuZHCg+MI88xQBOg X-Spam-Status: No X-Spam-Score: 0.0 (/) 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: 0.0 (/) Eli Zaretskii writes: > If some of those who are mightily confused now, as I predicted they > will be, supported what I said back then, perhaps we could have had > enough leverage to insist on better write-ups. But nooo! everyone who > cared to reply claimed that this is all either obvious or too personal > to describe, and some even said I'm a "bullshitter". I didn't. >"? That git is a pile of incomprehensibility should be pretty obvious to everybody. > Now you-all get to learn this stuff the hard way. Indeed. Hopefully after a few more days we'll have real recipes for how to do all these "obvious if you've studied the Gnomic Scriptures" tasks, and we can update the documentation with docs that actually say how to do things. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From unknown Sat Jun 21 12:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Nov 2014 15:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed To: Dmitry Gutov Cc: larsi@gnus.org, 19049@debbugs.gnu.org Reply-To: Eli Zaretskii Received: via spool by 19049-submit@debbugs.gnu.org id=B19049.141597761130955 (code B ref 19049); Fri, 14 Nov 2014 15:07:01 +0000 Received: (at 19049) by debbugs.gnu.org; 14 Nov 2014 15:06:51 +0000 Received: from localhost ([127.0.0.1]:60855 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpISV-000839-O2 for submit@debbugs.gnu.org; Fri, 14 Nov 2014 10:06:51 -0500 Received: from mtaout29.012.net.il ([80.179.55.185]:44329) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpISQ-00082x-FH for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 10:06:46 -0500 Received: from conversion-daemon.mtaout29.012.net.il by mtaout29.012.net.il (HyperSendmail v2007.08) id <0NF100C00AKWG000@mtaout29.012.net.il> for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 17:04:55 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout29.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF100AHSB874S40@mtaout29.012.net.il>; Fri, 14 Nov 2014 17:04:55 +0200 (IST) Date: Fri, 14 Nov 2014 17:06:31 +0200 From: Eli Zaretskii In-reply-to: <54661879.8070708@yandex.ru> X-012-Sender: halo1@inter.net.il Message-id: <838ujdizyg.fsf@gnu.org> References: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> <8361eijo4i.fsf@gnu.org> <86zjbt6f4y.fsf@yandex.ru> <546613A7.6010803@yandex.ru> <83bno9j0lf.fsf@gnu.org> <54661879.8070708@yandex.ru> X-Spam-Score: 1.0 (+) 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.0 (+) > Date: Fri, 14 Nov 2014 16:58:01 +0200 > From: Dmitry Gutov > CC: larsi@gnus.org, 19049@debbugs.gnu.org > > Sorry, as a Git user, I'm quite used to doing some history rewriting > before doing push. I suppose others will get used to it, too. It's easy to get used, yes. It is _not_ easy to figure out for the first time how to do it. If we had that in writing, we could just point people there (and many would read out of their own initiative). From unknown Sat Jun 21 12:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Nov 2014 15:12:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed To: Lars Magne Ingebrigtsen Cc: 19049@debbugs.gnu.org Reply-To: Eli Zaretskii Received: via spool by 19049-submit@debbugs.gnu.org id=B19049.141597789631412 (code B ref 19049); Fri, 14 Nov 2014 15:12:03 +0000 Received: (at 19049) by debbugs.gnu.org; 14 Nov 2014 15:11:36 +0000 Received: from localhost ([127.0.0.1]:60859 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpIX5-0008AV-Uf for submit@debbugs.gnu.org; Fri, 14 Nov 2014 10:11:35 -0500 Received: from mtaout21.012.net.il ([80.179.55.169]:52839) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpIWz-0008AI-WB for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 10:11:30 -0500 Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0NF100900B21KU00@a-mtaout21.012.net.il> for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 17:11:24 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF1009H0BIZJX40@a-mtaout21.012.net.il>; Fri, 14 Nov 2014 17:11:24 +0200 (IST) Date: Fri, 14 Nov 2014 17:11:14 +0200 From: Eli Zaretskii In-reply-to: X-012-Sender: halo1@inter.net.il Message-id: <837fyxizql.fsf@gnu.org> References: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> <8361eijo4i.fsf@gnu.org> <83fvdlj0u9.fsf@gnu.org> X-Spam-Score: 1.0 (+) 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.0 (+) > From: Lars Magne Ingebrigtsen > Cc: 19049@debbugs.gnu.org > Date: Fri, 14 Nov 2014 15:59:37 +0100 > > > Now you-all get to learn this stuff the hard way. > > Indeed. Hopefully after a few more days we'll have real recipes for how > to do all these "obvious if you've studied the Gnomic Scriptures" tasks, > and we can update the documentation with docs that actually say how to > do things. No, that's just the beginning. Almost every question asked about this resulted in umpteen different answers. Which one(s) to choose is another obstacle to negotiate, and it's not always easy, because each alternative has its subtle pro's and con's. We had 10 months and enough git expertise to discuss this and decide what's best. And we wasted it. From unknown Sat Jun 21 12:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Resent-From: Lars Magne Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Nov 2014 15:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed To: Eli Zaretskii Cc: 19049@debbugs.gnu.org Received: via spool by 19049-submit@debbugs.gnu.org id=B19049.141597824632057 (code B ref 19049); Fri, 14 Nov 2014 15:18:02 +0000 Received: (at 19049) by debbugs.gnu.org; 14 Nov 2014 15:17:26 +0000 Received: from localhost ([127.0.0.1]:60878 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpIci-0008Kr-VA for submit@debbugs.gnu.org; Fri, 14 Nov 2014 10:17:25 -0500 Received: from hermes.netfonds.no ([80.91.224.195]:47320) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpIch-0008Kj-Aw for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 10:17:20 -0500 Received: from cm-84.215.51.58.getinternet.no ([84.215.51.58] helo=stories.gnus.org) by hermes.netfonds.no with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1XpIcL-0006ZJ-JI; Fri, 14 Nov 2014 16:16:57 +0100 From: Lars Magne Ingebrigtsen References: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> <8361eijo4i.fsf@gnu.org> <83fvdlj0u9.fsf@gnu.org> <837fyxizql.fsf@gnu.org> Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAGFBMVEX9wrjSgoc2HiwVCxX2 qaV/TVsHAQj+3NJt0xTkAAACJ0lEQVQ4jU3UwW7jIBAGYLoi4prxwu45WOS+RvHZroh6BpcniOSz D5X8+vsP4CQoqZL5wsxgjyv2fd/Ea+1iJqKcswDsJSRDEIq/hCIFeBPiWBM+MkTTQEgZpqmIaKlU hcD5d4WNM+XIkGNNLEOt3moDciaauPILyAAsLxePuAjhHez3E1AiJ0Qa6CAbnDhqe9+gnKHAR/nu G7gwZ4c2Ik0CQV7Coutkc30D9dJgQEdBzAgiilfqG3jrSIOkyWXZJwyDzZpLV2olAFiDjcR9zaD0 Dm/0VoPDnnvOXCuYNxhcsu2S8XXqX5A1LhCfd3C41Cb58VHA4iRBUiqdcs40rg/Bmb5xDtzsI70f 0sjgccJ6h+fS7Lqu3voK5zYT++b9CFhLjcHpvwfsXQWugbhS6oCt90+IKDA9wS4FVsBZiK2BVB+2 bzDeFI9l+33s3PXYceF5m7+q6H4YD0CrmKYzVO3bffGPBm5SPKEBUVyYzrUNq4iATZYHQIZ7Nv6A ACgPh9p/yNDy3KHLs4Kl1X66GT++dqDExDdVi9MFQ3V9wcYzPidHC8B1bzs41d3aaONyo3htgAv7 w0MAILKxu3xWwIzv3FRiMGRuWpYtPPmcaQYQdc7Gs/isqXAAwZl6BxguGv8KxgpCyZlQ4oLJ8f++ kOJ3hYC3Ni5FrY113P2pwoSm5s73aCr5G2HHLwY85EJqWnCLif9qHOBPg2nm3w6YW48dkyT0O/4H zpEGCj95YicAAAAASUVORK5CYII= X-Now-Playing: Joni Mitchell's _Chalk Mark In A Rain Storm_: "The Beat of Black Wings" X-Hashcash: 1:23:141114:19049@debbugs.gnu.org::uHzDZVNp/Oi4HAaA:0000000000000000000000000000000000000000gRGx X-Hashcash: 1:23:141114:eliz@gnu.org::EUdzwwRkib2GkXpL:00001ToGz Date: Fri, 14 Nov 2014 16:16:57 +0100 In-Reply-To: <837fyxizql.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 14 Nov 2014 17:11:14 +0200") Message-ID: User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-MailScanner-ID: 1XpIcL-0006ZJ-JI X-Netfonds-MailScanner: Found to be clean X-Netfonds-MailScanner-From: larsi@gnus.org MailScanner-NULL-Check: 1416583017.86973@4o+YLOIDbcPdAXV8XTFfCA X-Spam-Status: No X-Spam-Score: 0.0 (/) 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: 0.0 (/) Eli Zaretskii writes: > No, that's just the beginning. Almost every question asked about this > resulted in umpteen different answers. Which one(s) to choose is > another obstacle to negotiate, and it's not always easy, because each > alternative has its subtle pro's and con's. > > We had 10 months and enough git expertise to discuss this and decide > what's best. And we wasted it. Well, I think the problem here is that git experts really aren't the people who are best suited to explain these things. They don't know what the incomprehensible things are. "Well, of course you have to stash the refs in the staging area! That's self-evident! You can't merge if you have unstaged refs that point to the foreign origin! I mean master!" So we get these recipes when people who aren't interested in git (like me) are forced to learn how to use it. I'll be summarising my experience in admin/notes tomorrow, since I now have a (more or less) working setup. And it'll be short, and won't mention the words "refs", "stash" or "staging", but will just give the commands that you should use. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From unknown Sat Jun 21 12:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Nov 2014 15:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed To: Lars Magne Ingebrigtsen Cc: 19049@debbugs.gnu.org Reply-To: Eli Zaretskii Received: via spool by 19049-submit@debbugs.gnu.org id=B19049.141597865732715 (code B ref 19049); Fri, 14 Nov 2014 15:25:02 +0000 Received: (at 19049) by debbugs.gnu.org; 14 Nov 2014 15:24:17 +0000 Received: from localhost ([127.0.0.1]:60886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpIjN-0008VT-1T for submit@debbugs.gnu.org; Fri, 14 Nov 2014 10:24:17 -0500 Received: from mtaout20.012.net.il ([80.179.55.166]:47446) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpIjH-0008VG-71 for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 10:24:11 -0500 Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NF100A00BSW7U00@a-mtaout20.012.net.il> for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 17:24:05 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF100AB0C451E50@a-mtaout20.012.net.il>; Fri, 14 Nov 2014 17:24:05 +0200 (IST) Date: Fri, 14 Nov 2014 17:23:56 +0200 From: Eli Zaretskii In-reply-to: X-012-Sender: halo1@inter.net.il Message-id: <8361ehiz5f.fsf@gnu.org> References: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> <8361eijo4i.fsf@gnu.org> <83fvdlj0u9.fsf@gnu.org> <837fyxizql.fsf@gnu.org> X-Spam-Score: 1.0 (+) 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.0 (+) > From: Lars Magne Ingebrigtsen > Cc: 19049@debbugs.gnu.org > Date: Fri, 14 Nov 2014 16:16:57 +0100 > > > We had 10 months and enough git expertise to discuss this and decide > > what's best. And we wasted it. > > Well, I think the problem here is that git experts really aren't the > people who are best suited to explain these things. They don't know > what the incomprehensible things are. Some of them are the best people, and some of them do know what's hard to comprehend. Some people do have the ability to document and explain something in your area of expertise. And if they don't, others could have done that, given the right recipes. > I'll be summarising my experience in admin/notes tomorrow, since I now > have a (more or less) working setup. I suggest to post that here first, and see that the advice you want to put in notes is sound. As you already understand, it's easy to become confused about these things. From unknown Sat Jun 21 12:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Nov 2014 15:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed To: larsi@gnus.org Cc: 19049@debbugs.gnu.org Reply-To: Eli Zaretskii Received: via spool by 19049-submit@debbugs.gnu.org id=B19049.1415978781461 (code B ref 19049); Fri, 14 Nov 2014 15:27:01 +0000 Received: (at 19049) by debbugs.gnu.org; 14 Nov 2014 15:26:21 +0000 Received: from localhost ([127.0.0.1]:60890 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpIlQ-00007N-OA for submit@debbugs.gnu.org; Fri, 14 Nov 2014 10:26:21 -0500 Received: from mtaout29.012.net.il ([80.179.55.185]:41233) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpIlO-00007D-3d for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 10:26:18 -0500 Received: from conversion-daemon.mtaout29.012.net.il by mtaout29.012.net.il (HyperSendmail v2007.08) id <0NF100F00BD3LW00@mtaout29.012.net.il> for 19049@debbugs.gnu.org; Fri, 14 Nov 2014 17:24:32 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout29.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF100AOPC4V4S70@mtaout29.012.net.il>; Fri, 14 Nov 2014 17:24:32 +0200 (IST) Date: Fri, 14 Nov 2014 17:26:07 +0200 From: Eli Zaretskii In-reply-to: <8361ehiz5f.fsf@gnu.org> X-012-Sender: halo1@inter.net.il Message-id: <834mu1iz1s.fsf@gnu.org> References: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> <8361eijo4i.fsf@gnu.org> <83fvdlj0u9.fsf@gnu.org> <837fyxizql.fsf@gnu.org> <8361ehiz5f.fsf@gnu.org> X-Spam-Score: 1.0 (+) 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.0 (+) > Date: Fri, 14 Nov 2014 17:23:56 +0200 > From: Eli Zaretskii > Cc: 19049@debbugs.gnu.org > > > I'll be summarising my experience in admin/notes tomorrow, since I now > > have a (more or less) working setup. > > I suggest to post that here first By "here" I meant emacs-devel, of course. From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 15 00:24:59 2014 Received: (at control) by debbugs.gnu.org; 15 Nov 2014 05:24:59 +0000 Received: from localhost ([127.0.0.1]:33006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpVr0-0007Wq-ML for submit@debbugs.gnu.org; Sat, 15 Nov 2014 00:24:58 -0500 Received: from a1www.kph.uni-mainz.de ([134.93.134.1]:44063) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpVqy-0007Wg-Vh for control@debbugs.gnu.org; Sat, 15 Nov 2014 00:24:57 -0500 Received: from a1i15.kph.uni-mainz.de (a1i15.kph.uni-mainz.de [134.93.134.92]) by a1www.kph.uni-mainz.de (8.14.9/8.14.7) with ESMTP id sAF5OtKF011846 for ; Sat, 15 Nov 2014 06:24:55 +0100 Received: from a1i15.kph.uni-mainz.de (localhost [127.0.0.1]) by a1i15.kph.uni-mainz.de (8.14.8/8.14.2) with ESMTP id sAF5Otkv017070; Sat, 15 Nov 2014 06:24:55 +0100 Received: (from ulm@localhost) by a1i15.kph.uni-mainz.de (8.14.8/8.14.8/Submit) id sAF5OtA1017066; Sat, 15 Nov 2014 06:24:55 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <21606.58279.324692.300223@a1i15.kph.uni-mainz.de> Date: Sat, 15 Nov 2014 06:24:55 +0100 To: control@debbugs.gnu.org Subject: control message for bug #19049 X-Mailer: VM 8.2.0b under 24.3.1 (x86_64-pc-linux-gnu) From: Ulrich Mueller X-Spam-Score: -0.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: -0.0 (/) reopen 19049 tags 19049 - fixed tags 19049 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 15 15:07:08 2014 Received: (at control) by debbugs.gnu.org; 15 Nov 2014 20:07:08 +0000 Received: from localhost ([127.0.0.1]:34134 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xpjci-0008Hq-DE for submit@debbugs.gnu.org; Sat, 15 Nov 2014 15:07:08 -0500 Received: from fencepost.gnu.org ([208.118.235.10]:54647) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xpjch-0008Hi-DI for control@debbugs.gnu.org; Sat, 15 Nov 2014 15:07:07 -0500 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1Xpjch-0005si-18 for control@debbugs.gnu.org; Sat, 15 Nov 2014 15:07:07 -0500 Date: Sat, 15 Nov 2014 15:07:07 -0500 Message-Id: Subject: control message for bug 19040 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 (-----) merge 19049 19040 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 17 04:57:05 2015 Received: (at control) by debbugs.gnu.org; 17 Jan 2015 09:57:05 +0000 Received: from localhost ([127.0.0.1]:59691 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YCQ7t-0002GC-1R for submit@debbugs.gnu.org; Sat, 17 Jan 2015 04:57:05 -0500 Received: from a1www.kph.uni-mainz.de ([134.93.134.1]:44302) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YCQ7p-0002Fg-Rk for control@debbugs.gnu.org; Sat, 17 Jan 2015 04:57:02 -0500 Received: from a1i15.kph.uni-mainz.de (a1i15.kph.uni-mainz.de [134.93.134.92]) by a1www.kph.uni-mainz.de (8.14.9/8.14.7) with ESMTP id t0H9utpa005741 for ; Sat, 17 Jan 2015 10:56:55 +0100 Received: from a1i15.kph.uni-mainz.de (localhost [127.0.0.1]) by a1i15.kph.uni-mainz.de (8.14.8/8.14.2) with ESMTP id t0H9utO8001365; Sat, 17 Jan 2015 10:56:55 +0100 Received: (from ulm@localhost) by a1i15.kph.uni-mainz.de (8.14.8/8.14.8/Submit) id t0H9usXE001361; Sat, 17 Jan 2015 10:56:54 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <21690.12774.774748.95734@a1i15.kph.uni-mainz.de> Date: Sat, 17 Jan 2015 10:56:54 +0100 To: control@debbugs.gnu.org Subject: control message for bug #19049 X-Mailer: VM 8.2.0b under 24.3.1 (x86_64-pc-linux-gnu) From: Ulrich Mueller X-Spam-Score: -0.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: -0.0 (/) tags 19049 fixed close 19049 25.1 thanks