Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions developer-workflow/development-cycle.rst
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,15 @@ produced from a maintenance branch are called **bugfix** or **maintenance**
releases; the terms are used interchangeably. These releases have a
**micro version** number greater than zero.

The only changes allowed to occur in a maintenance branch without debate are
bug fixes, test improvements, and edits to the documentation.
Changes backported to a maintenance branch fall into two groups. *Low-risk*
changes (bug fixes, test improvements, and documentation edits) may be
backported without debate. *Higher-risk* changes (new features, semantic
changes, and performance improvements) can introduce regressions, so they are
not backported as a matter of course.
Also, a general rule for maintenance branches is that compatibility
must not be broken at any point between sibling micro releases (3.12.1, 3.12.2,
etc.). For both rules, only rare exceptions are accepted and **must** be
discussed first.
etc.). For both rules, only rare exceptions are accepted, and each requires a
strong case agreed upon in discussion beforehand.

Backporting changes reduces the risk of future conflicts.
For documentation, it increases the visibility of improvements,
Expand Down
Loading