zsh-workers
 help / color / mirror / code / Atom feed
* Plan for the 5.9 branch
@ 2020-02-16 11:15 Daniel Shahaf
  2020-02-16 14:52 ` Peter Stephenson
                   ` (2 more replies)
  0 siblings, 3 replies; 11+ messages in thread
From: Daniel Shahaf @ 2020-02-16 11:15 UTC (permalink / raw)
  To: zsh-workers

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

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2020-03-07 22:08 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-16 11:15 Plan for the 5.9 branch Daniel Shahaf
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

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).