From 453d452653bcfff8c29a112e0529d4a1c17c97e3 Mon Sep 17 00:00:00 2001 From: Karen Tracey Date: Mon, 8 Dec 2008 17:15:56 +0000 Subject: [PATCH] In the release process doc, clarify that the original committer is responsible for backporting trunk fixes to the bug-fix branch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9610 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/internals/release-process.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/internals/release-process.txt b/docs/internals/release-process.txt index f1dca7b8607..c49d15a28e3 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 --------------------------