diff options
Diffstat (limited to 'quip-0016-branch-policy.rst')
| -rw-r--r-- | quip-0016-branch-policy.rst | 51 |
1 files changed, 27 insertions, 24 deletions
diff --git a/quip-0016-branch-policy.rst b/quip-0016-branch-policy.rst index 31102ec..f2272d7 100644 --- a/quip-0016-branch-policy.rst +++ b/quip-0016-branch-policy.rst @@ -34,17 +34,38 @@ Qt Creator) may choose a different approach. .. _`QtCS2019 Branch Policy Session`: https://wiki.qt.io/Qt_Contributors_Summit_2019_-_Branch_Policy -Types of Branches -================= +Types of Branches and their goals +================================= -Goal of the release branches (X.Y.Z) ------------------------------------- +Dev branch +---------- + +- New feature development (adding new API, classes, libraries or modules) +- Refactoring +- Risky changes, requiring longer testing period +- Completely new platforms + + +Stable branches (6.x) +--------------------- + +Each stable branch is initially stabilized after branching off dev, +in preparation for serving as the base for successive release branches. +Once stable, the branch generally accepts: + + - bug fixes + - performance fixes + - documentation fixes + + +Release branches (6.x.y) +------------------------ - Prepare the code-base for a release, only making changes needed for that release. -Goal of the long term support (LTS) branches (6.8 at the time of the latest update) --------------------------------------------------------------------------- +Long term support (LTS) branches (6.8 at the time of the latest update) +----------------------------------------------------------------------- - Support for 3 years after its initial release, extending the stable phase - Two releases each year, plus extra releases for fixes to any issues deemed @@ -77,24 +98,6 @@ users of Qt under the commercial license. The stable phase ends when the next mi or major release is available (typically after 6 months), and *strict* and *very strict* phases affect only commercial releases. -Goal of the stable branches (6.x) ---------------------------------- - -Each stable branch is initially stabilized after branching off dev, -in preparation for serving as the base for successive release branches. -Once stable, the branch generally accepts: - - - bug fixes - - performance fixes - - documentation fixes - -Goal of the dev branch: ------------------------ - -- New feature development (adding new API, classes, libraries or modules) -- Refactoring -- Risky changes, requiring longer testing period -- Completely new platforms Workflow ======== |