From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 10925 invoked from network); 3 Apr 2022 19:34:50 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 3 Apr 2022 19:34:50 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1649014490; b=fzdzOkE4lXEYwgXhb9pVDe0SyUXYa3YbJ17znSuDIcyyGw/TfJOc3B8vw8tbebRmfpS0sd0T51 4INqln0FMxmZVflm8B3VVXWojueQqPwfUPq3D64bosP3YjuqMIoSXuJmJI9TbukkcHzRUWrj7P QqewGGWklfQ8naw841DmqyKEzY4ReoBtV++7E2Yy7zqTf2OqX4SP3LpRCf7TNsOZHLLvmKbV53 vO5QebUcloylGpGIKHEAx2fTn+KYyYcA1YDFyB9C5JwumAunKmQcMSaJXjk/uwoutsR92sc8pQ Xp7gMLSlRFM20oVkpAM/YHtWVucWF+2Dw0P/f7N2jSaAPA==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (out1-smtp.messagingengine.com) smtp.remote-ip=66.111.4.25; dkim=pass header.d=dana.is header.s=fm1 header.a=rsa-sha256; dkim=pass header.d=messagingengine.com header.s=fm3 header.a=rsa-sha256; dmarc=none header.from=dana.is; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1649014490; bh=Aee3Wbae37qLfMkinYoiYQdhydOMPYsKOMBID9uo0lI=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Type:Subject:Cc:To:From:Date:References:In-Reply-To: Message-ID:MIME-Version:DKIM-Signature:DKIM-Signature:DKIM-Signature; b=rzbBGdkjWhRnTCAz+8izBAHsiFpyAiULKg6hBynRL6V/Vy/1opRfrbZibHafdpCIkJYsqE2xCz xkfcKIt7N1u4JV28kwWKI14XNnvzqw35oxF3zT/K5bieMCMSJF7g/nYJW02+m1vTyDb3H62xwn dwhCXIufAVam0Y5CCOwzHeqYEc5I0euYmQHNEEnEHE300Y8g6zcSSp8jaMIOnzOAkJ57Hsvx1T NjiVPx8GRYDnC8ANMStcqmAQe2bkVXt83HjKIVDPYmUuUk6Kc7O43nX3143kI4CSt9U8Tr36OU GDAUEOEWTnzIq1++1mOaz8LxKolDOwvvESJvRs5KC9d8hA==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Type:Subject:Cc:To:From:Date: References:In-Reply-To:Message-Id:Mime-Version:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=Aee3Wbae37qLfMkinYoiYQdhydOMPYsKOMBID9uo0lI=; b=b5sm3sKbad0AUwSH1p6zxcrzmW eziXheHbGHGgwLGwi9MbZ8JI2dh/ygI6K3EvbZzJt3VOegPWG2/5HqBaJzATmVcQ/jLXxEYIOlAg6 x9ZdkJzLE4cYD7RFRbTV0HZW9KWF1/L+9BKpl7meYMnn5G8mu26KllO1XA7Ppumh41IJ5jIz2OwWR e3YBEccHfAG0sn9eJiQ4I4104OHXFpneke8UUrpTAK+IgYcyJd/pafdCr6FF2Cp6VYpF6g8wbp9Qe EH/y85wkzzxtReIqijvSgSQ6yqTOP3tDM8LLN6YWad4XgHohMUvPrrDWW3aDVrjXq530H5TbdYfpJ rShKkZlg==; Received: from authenticated user by zero.zsh.org with local id 1nb5zs-000MZi-H0; Sun, 03 Apr 2022 19:34:48 +0000 Authentication-Results: zsh.org; iprev=pass (out1-smtp.messagingengine.com) smtp.remote-ip=66.111.4.25; dkim=pass header.d=dana.is header.s=fm1 header.a=rsa-sha256; dkim=pass header.d=messagingengine.com header.s=fm3 header.a=rsa-sha256; dmarc=none header.from=dana.is; arc=none Received: from out1-smtp.messagingengine.com ([66.111.4.25]:46719) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_256_GCM_SHA384:256) id 1nb5zc-000MFs-Ls; Sun, 03 Apr 2022 19:34:33 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 03CA55C0049; Sun, 3 Apr 2022 15:34:32 -0400 (EDT) Received: from imap50 ([10.202.2.100]) by compute5.internal (MEProxy); Sun, 03 Apr 2022 15:34:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dana.is; h=cc:cc :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; bh=Aee3Wbae37qLfMkinYoiYQdhydOMPYsKOMBID9 uo0lI=; b=ahFkRJmcmDC3IivlGql3hPhOexZ+j8alLQgo0FnBcBZvOeqiBLdEXh +Mvibl6KxHK5zlb/PlRFJBARvtLF0UGwi/+KI1YgP1Z3G/6HoPvwF0kc3Emloabm jdw9XF6RXp6mghrx2H51j2XfFZX5IcqJp7G/ay0Rg2u4M7MJV4Q9tArEaPCpuUp8 J0k5ns28X39CFCyuMR1A6BXvGQhb4K3kmUfkom6+948RG59MHtRgvlmNeMWEbrom +51cfvwr94GolmvBYMGdyCh28QiszOFOSZdoC/wrxedFLrF8QbhHaZGlj/lC/TIq WWOOpunKakJYbI6up/Bccj+CY7I9VHJA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=Aee3Wbae37qLfMkin YoiYQdhydOMPYsKOMBID9uo0lI=; b=F/Gs0ZTMS6UyNX85cOFaDFLe68LcrddjC VAL7cVWV1rPt4utn5bG1le8PqJqUwTJ5Sum5mHU/qvsCoG+fgwvjl+AeMsi2ieem tHM1YHIvhZMfeh39c2B6XPUv05UUmSyu1koT3NdyAea4/wG/l12pBSCUyVdyJQnF ZZLhzktqLOtlA6aXCRSi+4rH9F36bYOCFaDI0viEUPc6yTf8hHtS/l0uUCJ7XZ6k w5UFBe1HiHAR/X0KupizyNFf6mbo6V8yqsfPOer2u50MXEX1t4lTxqZXwl/ZNSZw n72DYfoPHmh3mfNpaIMIt7wY+20bJ+kf+AZf+5sLoIWt8XsAzh84Q== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrudejtddgudegtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefofgggkfgjfhffhffvufgtsehttdertderredtnecuhfhrohhmpegurghn rgcuoegurghnrgesuggrnhgrrdhisheqnecuggftrfgrthhtvghrnhepieeuhedtfedtle ehtdeglefgvdefudelgeeuudeljeefieejueetkeehveeugfetnecuvehluhhsthgvrhfu ihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepuggrnhgrsegurghnrgdrihhs X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id C46741920089; Sun, 3 Apr 2022 15:34:31 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.7.0-alpha0-382-g88b93171a9-fm-20220330.001-g88b93171 Mime-Version: 1.0 Message-Id: <6a3e3908-d017-443b-be9b-e78840dc2265@www.fastmail.com> In-Reply-To: References: <2edcc9b8-6877-40d3-b2c1-158fafeed806@www.fastmail.com> <1b9eb6a0-f9bb-42c2-9ff8-8c9a61e6e4ce@www.fastmail.com> <526109583.788642.1648724722076@mail2.virginmedia.com> <17292100-61f9-4183-8d04-6f8443f3c2f7@www.fastmail.com> Date: Sun, 03 Apr 2022 14:34:11 -0500 From: dana To: "Bart Schaefer" Cc: "Zsh hackers list" Subject: Re: Branching (was Re: We should get 5.9** out soon) Content-Type: text/plain X-Seq: 49974 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: List-Subscribe: List-Unsubscribe: List-Post: List-Owner: List-Archive: On Sun 3 Apr 2022, at 12:04, Bart Schaefer wrote: > The benefit of a separate release branch is that we don't have to > coordinate a code freeze among the full group with "git push" access. > ... > On the other hand, if we want to introduce "long-term support" for > major version numbers, having a branch to which events like the 5.8 -> > 5.8.1 security release could be pushed would be the way to go. Yes, these were the two situations i was thinking of that could benefit from having separate branches. Branching off at release-freeze time and then back-porting any necessary additions from master is the method i have experience with, but maybe some people on the team would be annoyed by the extra steps dana