bulia:
On 9/27/05, Ralf Stephan <ralf@...748...> wrote:
I started with small steps but they all involved recompiling a lot for cvs users. Grumbling started. What I blame myself for is not having branched then. OTOH, no one advised me to.
Branch would not be a solution. In the trunk, these issues were found only after some time, even though everyone was using and testing the trunk. This means that in the branch (that much fewer people would use (especially since it provides no exciting new functionality, just code tweaking)) they would likely never be found at all. They would be found after the branch is merged back, i.e. we would get the same situation only with a bigger delay.
Don't be so black/white! :)
Obviously, the proper way to branch (and the cvs info pages do actually recommend it this way) is to make short branches with a definite goal. Your scenario is a good argument for it.
So, branching yes, but not for long. Simply demand a certain diff size when to merge back. Say 50kb.
ralf