On Sunday 25 June 2006 11:04, Stefan Küng wrote:
> One thing we have to discuss though is how we should handle this. Right
> now, trunk is for the upcoming 1.4.0 release. We have to create a new
> branch for this. Question is now what the branch would be for: 1.4.x or
> 1.5.0. If the branch would be for 1.5.0, then we'd have a lot of merging
> to do from trunk to 1.5.0 to keep it in sync until we branch for 1.4.x.
> If the branch is for 1.4.x, then we have to merge a lot of fixes from
> trunk to it.
Since we depend von the subversion project when 1.4.0 will be released and
the time line is still quite vague, I propose the following:
- create a feature branch for issue 45 based on todays trunk
- create the 1.4.x branch based on trunk as soon as subversion 1.4.0 has
been released (maybe a few days earlier if the date is definite).
- create a TSVN 1.4.0-RC1 based on the 1.4.x branch on the same day
- release TSVN 1.4.0 a week later (This gives us a chance to patch
subversion 1.4.0 if a major bug is found in the first week).
- merge the feature branch for issue 45 into trunk and delete the branch.
Did I miss the obvious? This approach seems easier to me and doesn't require
a lot of merges.
Tobias
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sun Jun 25 11:28:55 2006