Am 10.05.2011 um 17:27 schrieb Vincent van Ravesteijn: > There are > plenty of cases where a bug gets fixed in trunk first, and then we wait > to commit to branch until we see how that goes. > > In the development model I propose, we fix a bug in a topic branch. > This branch will regularly be merged into a > testing branch which is comparable to the current svn trunk. When a > feature is cooked, tested, or if we have seen how it goes, the feature > will be merged either into master (a sort of stable trunk) or it will be > merged into BRANCH_2_0_X. All fixes that are merged into > BRANCH_2_0_X will of course get merged into the stable trunk > as well when BRANCH_2_0_X get merged into master.
So, if a bug is attacked in a branch and this lasts a while you need to remerge the BRANCH_2_0_X regularly into your bug fixing branch(es), right? Stephan
