|
From: Julian S. <js...@ac...> - 2014-09-12 09:39:25
|
On 09/09/2014 10:31 PM, Philippe Waroquiers wrote: > E.g. rev 14505 looks to be a good candidate to put in 3.10. > So, for such things, do we fix on the trunk, and then (someone?) merge > each such change to the 3.10 branch ? That is my understanding of the conventional approach, and is what I would prefer to do. Fixing stuff on the trunk first gives us a "safe" place to test it and, for complex fixes, to iterate the fix until it is stable. Then it can be pushed to the branch. In contrast, fixing stuff on the branch undermines the stableness of the branch, which is bad, since the primary purpose of the branch is to provide a stable, low-risk version of the code. If you have stuff which should go on the branch, or should be considered for the branch, please make a note of it in docs/internals/3_10_BUGSTATUS.txt (on the trunk!). That way it won't get forgotten about. Depending on how 3.10.0 works out, I would tentatively propose to do a 3.10.1 release relatively soon -- early/mid November -- to fix any critical breakage that is reported in 3.10.0. J |