Author: kmtracey Date: 2008-12-08 11:18:50 -0600 (Mon, 08 Dec 2008) New Revision: 9611
Modified: django/branches/releases/1.0.X/ django/branches/releases/1.0.X/docs/internals/release-process.txt Log: [1.0.X] In the release process doc, clarify that the original committer is responsible for backporting trunk fixes to the bug-fix branch. r9610 from trunk. Property changes on: django/branches/releases/1.0.X ___________________________________________________________________ Name: svnmerge-integrated - /django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9396,9399-9462,9466-9469,9471-9488,9491-9523,9535,9543-9544,9546,9548 + /django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9396,9399-9462,9466-9469,9471-9488,9491-9523,9535,9543-9544,9546,9548,9610 Modified: django/branches/releases/1.0.X/docs/internals/release-process.txt =================================================================== --- django/branches/releases/1.0.X/docs/internals/release-process.txt 2008-12-08 17:15:56 UTC (rev 9610) +++ django/branches/releases/1.0.X/docs/internals/release-process.txt 2008-12-08 17:18:50 UTC (rev 9611) @@ -179,9 +179,10 @@ 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 -------------------------- --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Django updates" group. To post to this group, send email to django-updates@googlegroups.com To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/django-updates?hl=en -~----------~----~----~----~------~----~------~--~---
