From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#24073: 25.1-rc2 Date: Sat, 01 Apr 2017 14:44:31 +0300 Message-ID: <83wpb44ajk.fsf@gnu.org> References: <1469520753.418402.676896009.00AAC0DE@webmail.messagingengine.com> <1472605956.265564.710992545.0AE0C6FD@webmail.messagingengine.com> <83zintlkxl.fsf@gnu.org> <0085D3FE-32C4-4AFB-89DA-9DD205D8A2AB@paulwrankin.com> <83shtlkoba.fsf@gnu.org> <1472877535.1718060.714506377.6182C525@webmail.messagingengine.com> <83lgypi85j.fsf@gnu.org> <87twddnu5t.fsf@saiph.selenimh> <83eg4hi7i4.fsf@gnu.org> <1474278005.1585720.729925393.571A4732@webmail.messagingengine.com> <83r38fhm2t.fsf@gnu.org> <87shshhkva.fsf@bzg.fr> <1490861900.2033376.928338448.5AC2EDDB@webmail.messagingengine.com> <874lya2tcu.fsf@users.sourceforge.net> <1491028842.1395227.930599688.38B5B97F@webmail.messagingengine.com> <8760ior3v6.fsf@linux-m68k.org> <1491033966.1408911.930645392.12EC4E9A@webmail.messagingengine.com> <871stcr12k.fsf@linux-m68k.org> <1491037909.1419343.930674952.1A97633E@webmail.messagingengine.com> <87wpb4piy5.fsf@linux-m68k.org> <1491041917.2348139.930696624.13E83F1A@webmail.messagingengine.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: blaine.gmane.org 1491047113 16321 195.159.176.226 (1 Apr 2017 11:45:13 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 1 Apr 2017 11:45:13 +0000 (UTC) Cc: bzg@gnu.org, 24073@debbugs.gnu.org, schwab@linux-m68k.org, mail@nicolasgoaziou.fr, npostavs@users.sourceforge.net To: Paul Rankin Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Apr 01 13:45:07 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cuHSp-0003Ae-Ep for geb-bug-gnu-emacs@m.gmane.org; Sat, 01 Apr 2017 13:45:03 +0200 Original-Received: from localhost ([::1]:50776 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cuHSv-0007w8-AC for geb-bug-gnu-emacs@m.gmane.org; Sat, 01 Apr 2017 07:45:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cuHSp-0007vw-En for bug-gnu-emacs@gnu.org; Sat, 01 Apr 2017 07:45:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cuHSo-000055-Eu for bug-gnu-emacs@gnu.org; Sat, 01 Apr 2017 07:45:03 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:56924) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cuHSo-000051-B4 for bug-gnu-emacs@gnu.org; Sat, 01 Apr 2017 07:45:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cuHSo-0003BQ-4w for bug-gnu-emacs@gnu.org; Sat, 01 Apr 2017 07:45:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 01 Apr 2017 11:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 24073 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 24073-submit@debbugs.gnu.org id=B24073.149104709712210 (code B ref 24073); Sat, 01 Apr 2017 11:45:02 +0000 Original-Received: (at 24073) by debbugs.gnu.org; 1 Apr 2017 11:44:57 +0000 Original-Received: from localhost ([127.0.0.1]:55123 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cuHSi-0003As-T1 for submit@debbugs.gnu.org; Sat, 01 Apr 2017 07:44:57 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:38195) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cuHSh-0003Ag-1D for 24073@debbugs.gnu.org; Sat, 01 Apr 2017 07:44:55 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cuHSa-0008RE-UP for 24073@debbugs.gnu.org; Sat, 01 Apr 2017 07:44:49 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:46634) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cuHSH-0008Gc-2w; Sat, 01 Apr 2017 07:44:29 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4833 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1cuHSG-0005dw-0T; Sat, 01 Apr 2017 07:44:28 -0400 In-reply-to: <1491041917.2348139.930696624.13E83F1A@webmail.messagingengine.com> (message from Paul Rankin on Sat, 01 Apr 2017 20:18:37 +1000) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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" Xref: news.gmane.org gmane.emacs.bugs:131166 Archived-At: > From: Paul Rankin > Date: Sat, 01 Apr 2017 20:18:37 +1000 > Cc: Bastien Guerry , 24073@debbugs.gnu.org, mail@nicolasgoaziou.fr, > npostavs@users.sourceforge.net > > > > $ git branch -a --contains fe91ff27c54cc10b70a5c5d5bac4017922866717 > > > * master > > > remotes/origin/HEAD -> origin/master > > > remotes/origin/emacs-25 > > > remotes/origin/feature/mhtml-mode > > > remotes/origin/fix-bug-21072 > > > remotes/origin/master > > > remotes/origin/scratch/record > > > remotes/origin/scratch/tzz/nettle > > > > That's only after emacs-25 has been merged into master. > > > > Okay so we've established that the commit is in master after all 👍 That wasn't controversial to begin with. The issue was with the emacs-25.2-rc2 tag, not with the commit which fixed the bug in question. The commit is on master, whereas the tag was applied to the emacs-25 branch, which was later merged to master, as part of periodic merges we do. > Emacs development appears to go along in a kind of unorthodox way. It's a merge-based workflow, one of widely used Git workflows. We didn't invent it. The details are described in the file CONTRIBUTE in the tree, under "Branches". > As someone familiar with git but unfamiliar with the Emacs dev workflow, my assumption was that anything in master is ready to ship out the door, with the bulk of commits happening on feature or hotfix branches. But it appears to work in the reverse, with everything going into master, and stable releases branching off, which seems like a good recipe for perpetual missing-of-boatsness. When the branch from which the next official release is about to be shipped is close to a release, we don't allow unsafe changes to be committed to that branch, because any such change could potentially destabilize the entire branch. There's nothing new here; if you were ever involved in releasing very large and complex packages, you should be familiar with this paradigm.