From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Date: Fri, 14 Nov 2014 16:47:26 +0200 Message-ID: <83fvdlj0u9.fsf@gnu.org> References: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> <8361eijo4i.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1415976539 2658 80.91.229.3 (14 Nov 2014 14:48:59 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 14 Nov 2014 14:48:59 +0000 (UTC) Cc: 19049@debbugs.gnu.org To: Lars Magne Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Nov 14 15:48:54 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XpIBA-0002aR-Uz for geb-bug-gnu-emacs@m.gmane.org; Fri, 14 Nov 2014 15:48:53 +0100 Original-Received: from localhost ([::1]:36831 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpIBA-0003i0-0G for geb-bug-gnu-emacs@m.gmane.org; Fri, 14 Nov 2014 09:48:52 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45495) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpIAS-0002tT-D1 for bug-gnu-emacs@gnu.org; Fri, 14 Nov 2014 09:48:14 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpIAM-0000IT-Io for bug-gnu-emacs@gnu.org; Fri, 14 Nov 2014 09:48:08 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:34882) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpIAM-0000IJ-FN for bug-gnu-emacs@gnu.org; Fri, 14 Nov 2014 09:48:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1XpIAL-0007Rp-Qm for bug-gnu-emacs@gnu.org; Fri, 14 Nov 2014 09:48:01 -0500 X-Loop: help-debbugs@gnu.org 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 Original-Received: via spool by 19049-submit@debbugs.gnu.org id=B19049.141597646728591 (code B ref 19049); Fri, 14 Nov 2014 14:48:01 +0000 Original-Received: (at 19049) by debbugs.gnu.org; 14 Nov 2014 14:47:47 +0000 Original-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 Original-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 Original-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) Original-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) In-reply-to: X-012-Sender: halo1@inter.net.il X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:95999 > 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.