From: Marcelo V. <va...@us...> - 2008-11-25 19:09:31
|
On Tue, Nov 25, 2008 at 8:40 AM, Kazutoshi Satoda <k_s...@f2...> wrote: > No one (other than me) will do the merge? Really? How about "the person who checks in the code into the release branch is responsible for merging it into the trunk"? This strategy works great with perforce since merging is pretty easy, but I don't know how easy would it be with svn. About Alan's "I only run trunk" comment: it's a compromise. Having a single branch means we'll be forever stuck in these "pre-release" cycles unless we piss people off by locking the trunk from time to time. Having a release branch means testing is dilluted, but it's easier to control releases without blocking new development. -- Marcelo Vanzin mmv...@gm... "Life's too short to drink cheap beer." |