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 23075 invoked from network); 3 Apr 2022 17:05:07 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 3 Apr 2022 17:05:07 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1649005507; b=Z4N7ldoYysJ+dW+xusMpy4PtCA60PWT7ylpS15YSW90svKq5lWi3888PrMW3nuK9Td1ffYRy29 G8a+NeSEFS68aLfJMzI0piHRe2rt/tOVGI5oaa8oiHyFItFefZC1yTkgHjMfYnF0tBfPYiHCOg ot/X2St9fHLmjKfazZUbGWpTSrAzK+Gh91RgwtqGwMBFK+Ae5ms5K6pjVJKoxYc7MlD8/MhIBx MZAhEwMt63EYe44onIneSCmKrfLSA060U35Ltry6Zyl5CZGSic5dFEBv6UYGFfafC1siPk+aSQ CQjAANyFn/2mrAm32v2vAOt6656CG7KGu6zjWnHxa5NQbQ==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-ej1-f53.google.com) smtp.remote-ip=209.85.218.53; dkim=pass header.d=brasslantern-com.20210112.gappssmtp.com header.s=20210112 header.a=rsa-sha256; dmarc=none header.from=brasslantern.com; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1649005507; bh=kEr+GSdiwqrYXwAbueudwK58xRB4FyCEsHBmGcsL964=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Type:Cc:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:DKIM-Signature:DKIM-Signature; b=glARM2W9TwXmTAW+a1337EW+jNYVsbBkSTFZ2NluyGvXMCeJXyhFdXLvMJhoUScxY/lHorNKqm /R9gDGAjSZiRbJBYlnb72unodcUJQGAuxKJrS6qwum0MFeBd2LdURJcnVdbI1IMBpkxO3qpeGY BINrUZJCEi4uuz9FRvoTdY1dQEAHqHkeoauMfQtp9BYyC7igJPDXYnsxe0uyyVxzEvKhx6KJ1y 3GeNheBI/z+wt9ifJYste73QuJJWhU/64oqz1IT4WskTOUyOQ+16fd4hm0wXgVmhWxJN6gfCGZ 1t3XUTqb8V1qwUTtHSm9V9xDeiMxiIXuuFU5gM5h7Aq8Ow==; 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:Cc:To:Subject:Message-ID :Date:From:In-Reply-To:References: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=F7YJ5FtAZUMspHHSx6n96pLfq/xtG7N9G88n9rm+ZTs=; b=sf9llmyryu+7OJbbVcdDxAujX7 7nGXLJx7wTVJ8j4A0xNMZEqR+igq3rh6SrN52cgZLDTCoaSjNpBXJC09yZ96++4TCwGgpZJtoPchL NCK6l3vaoFixnHorj3pyJpATrYpf4oi2oFz8Ggm9p4Yew6FDHv9bfzlVA7V6FchCZzS3vLdhlFIPI qp0pur+pPblJ2/dJQJNRt3ySyUOZdFuvz2JI+s/HkWJ++25WcbtELoPkHJTGgZK/xJQQZQBC6sCLY j2Cp2v2ivOJITENj6lD7k9tssmZMqX+ZZ2oYYdgWkdqGm5MfRAdbrVSBHUjR+V5VLDzGw3/CJv6GZ ViD7vGjQ==; Received: from authenticated user by zero.zsh.org with local id 1nb3ey-000I31-OK; Sun, 03 Apr 2022 17:05:04 +0000 Authentication-Results: zsh.org; iprev=pass (mail-ej1-f53.google.com) smtp.remote-ip=209.85.218.53; dkim=pass header.d=brasslantern-com.20210112.gappssmtp.com header.s=20210112 header.a=rsa-sha256; dmarc=none header.from=brasslantern.com; arc=none Received: from mail-ej1-f53.google.com ([209.85.218.53]:33741) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1nb3eU-000Hki-8W; Sun, 03 Apr 2022 17:04:34 +0000 Received: by mail-ej1-f53.google.com with SMTP id a6so4526049ejk.0 for ; Sun, 03 Apr 2022 10:04:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brasslantern-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=F7YJ5FtAZUMspHHSx6n96pLfq/xtG7N9G88n9rm+ZTs=; b=xIqM7p0VryaTbdrTxWkWCEBg3Spk1daf/717tTpA9bIV1du0wBgsSHuC8yObvBjV3U AxoqyWlio09EECgEYUGlEddAEjuMwwvICz/fqja53Sd7IGzNPU2m6/r3vYEULq/XGFiy TnSgDm6S1SXet6Q/M/3QZgmLcFMvNiYv8A2QtA0iGrzt5ADD8GecQKHwLX7qXrNPfCQZ 03Vrkb7d71lnlrnnzBHNfTyl2R92QZ4GhzdIKBABd3k4zvLk84ilFHzu1V9X4y4v9HfM 5EVny7/IqquHB3FtT6YrwQAHZBP8jDCKCkH7ao+mPxsqw9jhIaI9tbk9I14Yzb6yzhoe CktA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=F7YJ5FtAZUMspHHSx6n96pLfq/xtG7N9G88n9rm+ZTs=; b=D6gpdAMieH9vJdx561loRzS0CYMa6H6aJ8DG43Oj1+wMWZjrOLZMMbwt+wyakukHhZ 50Vk72aKx/iL9xdSUABcjzq1/UJu14Hd4SwtW1vH/YRJ72h8olqpLKn5XcpsKmy6so91 28+akvXWD+QDSozx1kQKzwlYksKKLGOZ21RjR4i85UOmzAyQK3RabQ4fPV+b62skbb2l /C1gChLPQMXJ/mK4g+OXACmy8n/LWA9zZHWrs6Bm7ATiwfNdRNfdUup9LEh65etGLAHM Vovnyv3sqT8F3g+lQuMBZmLgibwWx5JVWrSKORD8YMXWCIa6O/uCZRoixKJxtqbuxqxD AOMw== X-Gm-Message-State: AOAM533swVruZxmQk1GlSQNOY8GcL7Jd50lliagbQlRlaWEQlYeUvAVd VI9YOVD/rA3lJT9Sw5+0E2hYGbsMWqa6tsYs0L2MSvze828Yig== X-Google-Smtp-Source: ABdhPJwIsc2Cl2wa/W6NsrDBGsCKcO9W2PuyY17xJYum/p7F2kWOqGWi+Vp9FzFtccJKvzEc7rFtahr67ytPN1TAtzA= X-Received: by 2002:a17:907:7d86:b0:6e4:a344:2162 with SMTP id oz6-20020a1709077d8600b006e4a3442162mr7543545ejc.576.1649005473891; Sun, 03 Apr 2022 10:04:33 -0700 (PDT) MIME-Version: 1.0 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> In-Reply-To: From: Bart Schaefer Date: Sun, 3 Apr 2022 10:04:22 -0700 Message-ID: Subject: Branching (was Re: We should get 5.9** out soon) To: dana Cc: Zsh hackers list Content-Type: text/plain; charset="UTF-8" X-Seq: 49972 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 Sat, Apr 2, 2022 at 3:47 PM dana wrote: > > PS: There has been some discussion in the past about changing the release > process so that instead of going directly off master we e.g. make a 5.9 > branch as the 'cycle' is winding down and release off that. 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. That was not much of a problem when we had only about three people in that set, but as we've opened it to a larger number of trusted individuals it takes more effort. Aside from just proceeding as we have been (which is fine for 5.9), an alternate plan would be to have a development branch and only merge it back to the main branch at release time. That would avoid creating several possibly-active branches. 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.