From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Paul Rankin Newsgroups: gmane.emacs.bugs Subject: bug#24073: 25.1-rc2 Date: Sat, 01 Apr 2017 22:05:14 +1000 Message-ID: <1491048314.2365444.930749632.43C4F35E@webmail.messagingengine.com> 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> <83wpb44ajk.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1491048390 15206 195.159.176.226 (1 Apr 2017 12:06:30 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 1 Apr 2017 12:06:30 +0000 (UTC) Cc: bzg@gnu.org, 24073@debbugs.gnu.org, schwab@linux-m68k.org, mail@nicolasgoaziou.fr, npostavs@users.sourceforge.net To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Apr 01 14:06:24 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 1cuHnI-00021P-KD for geb-bug-gnu-emacs@m.gmane.org; Sat, 01 Apr 2017 14:06:13 +0200 Original-Received: from localhost ([::1]:51054 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cuHnO-0001ft-Ck for geb-bug-gnu-emacs@m.gmane.org; Sat, 01 Apr 2017 08:06:18 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:32867) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cuHnF-0001fk-Cz for bug-gnu-emacs@gnu.org; Sat, 01 Apr 2017 08:06:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cuHn8-00069h-6I for bug-gnu-emacs@gnu.org; Sat, 01 Apr 2017 08:06:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:56943) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cuHn8-00069K-2I for bug-gnu-emacs@gnu.org; Sat, 01 Apr 2017 08:06:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cuHn7-0003kM-IV for bug-gnu-emacs@gnu.org; Sat, 01 Apr 2017 08:06:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Paul Rankin Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 01 Apr 2017 12:06:01 +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.149104831714349 (code B ref 24073); Sat, 01 Apr 2017 12:06:01 +0000 Original-Received: (at 24073) by debbugs.gnu.org; 1 Apr 2017 12:05:17 +0000 Original-Received: from localhost ([127.0.0.1]:55142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cuHmP-0003jN-84 for submit@debbugs.gnu.org; Sat, 01 Apr 2017 08:05:17 -0400 Original-Received: from out1-smtp.messagingengine.com ([66.111.4.25]:41794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cuHmN-0003jF-A5 for 24073@debbugs.gnu.org; Sat, 01 Apr 2017 08:05:16 -0400 Original-Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 1289020BE6; Sat, 1 Apr 2017 08:05:15 -0400 (EDT) Original-Received: from web5 ([10.202.2.215]) by compute3.internal (MEProxy); Sat, 01 Apr 2017 08:05:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paulwrankin.com; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=jOVU6gxQFBEu+i7tz QwD+5QJceRZkkjvruVgENcaDWc=; b=vyeJAPCdsjh8n+ShW91zaExnH7hPZttzO dDPj6cgBPP04BH8+yr1Ap1iz9JExiqhKslmw12KyImdgzJ6Sqv/j1CKoI8SHT69E BExIT02KDW+DSOnJ34bctdvfz/WEb1R50XmjQmvBHfWbn1jADpyY87MTbyJAHu/Q daXUtXsKChRT8b6sfrQzKUFHwty4UgM7TJz9IJ7iN6dSpbZWJgdJOZM+HP9f+O4a TVpgVyXpyMtC8jZc23fD4F+s9zQ6O+DPULKVZANB/imVpFuynVpqZ4F2oSkrFhMF wlaVASCJHkLxWEXVCgDhEG47HkZjfwIYKkk/XnM4+qrVjYd5UCBRQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=jOVU6g xQFBEu+i7tzQwD+5QJceRZkkjvruVgENcaDWc=; b=MmKJUrJBDhPpJey5PaF9t+ kCt3CofBIxQiB9kqyQGrZtHAKWKGaB1iJb5iT3HJJJxF3iDm1lvhNFTgPmuEsWzo oalwc5FPrLw5ofF+q1/iq8eBVNc4zZyL4LT3K5mQbhhJeh3nZ63HRhoakw1k818z D1ZtVPw9HJDCWU21MmR0M6u7/xTVAlT+Lf7nMup2cOex1RXD3JSTABdKCyEoHP9y CW+8Dyb0/k/42X12d/lK1bZjeOlfabLvF0zY3wZbrSxkbHgKpF859k7bDPdArK4y WVI3+6TeQuUJUo5MUlrPsHD1SZXOfsV9SrHpDoq9fp1JjmLc5sKHBIfKaRRHsq3Q == X-ME-Sender: Original-Received: by mailuser.nyi.internal (Postfix, from userid 99) id D57339E210; Sat, 1 Apr 2017 08:05:14 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface - ajax-6cc8b445 In-Reply-To: <83wpb44ajk.fsf@gnu.org> 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:131168 Archived-At: On Sat, 1 Apr 2017, at 09:44 PM, Eli Zaretskii wrote: > > From: Paul Rankin > > Date: Sat, 01 Apr 2017 20:18:37 +1000 > > Cc: Bastien Guerry , 24073@debbugs.gnu.org, mail@nicolasgo= aziou.fr, > > npostavs@users.sourceforge.net > >=20 > > > > $ 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 > > >=20 > > > That's only after emacs-25 has been merged into master. > > >=20 > >=20 > > Okay so we've established that the commit is in master after all =F0=9F= =91=8D >=20 > 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. Question was about this tagged commit in master in Feb after the bug fix co= mmit last Sep. > 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. >=20 > > Emacs development appears to go along in a kind of unorthodox way. >=20 > 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". >=20 > > 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 ap= pears to work in the reverse, with everything going into master, and stable= releases branching off, which seems like a good recipe for perpetual missi= ng-of-boatsness. >=20 > 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. Yep, the original question was about workflow, which this answers. Thanks ;)