2008/5/23 James Sharpe <james.sharpe@gmail.com>:
So what I would propose is this: branches/release gets moved to branches/release1_35 and a 1.35.1 release be made from fixes on this - not a huge amount of work since essentially just patching up from trac bug reports, ensuring changes are also merge on trunk and release1_36 (where applicable). branches/release1_36 gets made from trunk asap Then development for 1.36 happens alongside 1.35.1. Ideally the branch for 1.36 would have been made after feature freeze for 1.35 occurred. The reason for this is that it enables trunk to become a stabilising area for features for the next release i.e. it implicitly becomes release1_n+1(any features not ready for integration should be developed on a feature branch branched from trunk to be later merged back to trunk).
+1