summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/release-process.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/internals/release-process.txt b/docs/internals/release-process.txt
index f1dca7b860..c49d15a28e 100644
--- a/docs/internals/release-process.txt
+++ b/docs/internals/release-process.txt
@@ -179,9 +179,10 @@ After a minor release (i.e 1.1), the previous release will go into bug-fix mode.
A branch will be created of the form ``branches/releases/1.0.X`` to track
bug-fixes to the previous release. When possible, bugs fixed on trunk must
*also* be fixed on the bug-fix branch; this means that commits need to cleanly
-separate bug fixes from feature additions. Each bug-fix branch will have a
-maintainer who will work with the committers to keep them honest on backporting
-bug fixes.
+separate bug fixes from feature additions. The developer who commits a fix to
+trunk will be responsible for also applying the fix to the current bug-fix
+branch. Each bug-fix branch will have a maintainer who will work with the
+committers to keep them honest on backporting bug fixes.
How this all fits together
--------------------------