From: Kazutoshi S. <k_s...@f2...> - 2008-11-26 17:53:56
|
Marcelo Vanzin wrote: > On Tue, Nov 25, 2008 at 11:32 AM, Alan Ezust <ala...@gm...> wrote: >>> How about "the person who checks in the code into the release branch >>> is responsible for merging it into the trunk"? >> >> I thought we first commit to trunk, where the fix is tested, and later >> it is merged into a "stable" point release if it is deemed a critical >> bug. What do you mean by merge into the trunk? > > I was thinking more among the lines of: if you're developing a feature > for the next release, you should be working on the release branch > (after it's cut). If you're fixing a bug that should be fixed in the > next release, you should also be working on the release branch. Then > you make the changes there and merge them into the trunk. It sounds different from my proposal; a bug is fixed on the trunk first, and merged to the release branch later. And also, a review by another committer is a requirement to make the release branch more stable, while we don't have good test suits. I think "work on the branch first" is the method for feature branches, but not good for release branches. Do you really think a bug should be fixed on a release branch first? (, then why?) -- k_satoda |