From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Subject: Plan for the 5.9 branch
Date: Sun, 16 Feb 2020 11:15:11 +0000 [thread overview]
Message-ID: <20200216111511.73ea28fa@tarpaulin.shahaf.local2> (raw)
A few weeks ago I created a 5.9 branch for bugfixes/patches that seemed
too risky to push to master during pre-release stabilization.
I'd like to merge that branch to master in a few weeks, when it's clear
there won't be a 5.8.1 for regressions.
(Alternatively, we could merge the branch now; that won't block us from
creating a 5.8.1 regression-fixing release with or without the changes
from the 5.9 branch.)
---
As to branching policy, in the future we should probably do things the
other way around; that is: in the run-up to the 5.9 release next year,
rather than stabilize on master and open a 5.10 branch for destabilizing
changes, we should open a 5.9 branch for stabilization and leave master
open to destabilizing changes.
(Fortunately, due to how git fast-forward merges work, the current 5.9
branch won't interfere with this plan.)
Makes sense?
Cheers,
Daniel
next reply other threads:[~2020-02-16 11:15 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-16 11:15 Daniel Shahaf [this message]
2020-02-16 14:52 ` Peter Stephenson
2020-02-17 2:47 ` dana
2020-02-17 9:19 ` Daniel Shahaf
2020-02-18 19:40 ` dana
2020-02-18 20:44 ` Bart Schaefer
2020-02-19 10:23 ` Daniel Shahaf
2020-02-19 10:32 ` Daniel Shahaf
2020-02-19 15:21 ` Bart Schaefer
2020-02-19 20:00 ` dana
2020-03-07 22:07 ` Daniel Shahaf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200216111511.73ea28fa@tarpaulin.shahaf.local2 \
--to=d.s@daniel.shahaf.name \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).