On Thursday 29 May 2008 2:40:54 pm Jason Voegele wrote:
> Due to concerns about maintaining too many active code-lines and too
> frequent merging, we've decided to revise our branching strategy.  The
> current 2.6 branch is going to be deleted, since it is effectively the same
> as trunk. The current 2.6.0 branch will be renamed to 2.6, and will serve
> as the maintenance (bug fix) branch for the 2.6.x series of Terracotta.
>
> What this means for you is that, if you have an existing checkout of either
> the 2.6 or 2.6.0 branch, you will need to delete it and check out from the
> new 2.6 branch from scratch.
>
> I'll send a follow-up message once these changes have been made.

The old 2.6 branch has been deleted and the new 2.6 branch is in place.  From 
this point forward, the 2.6 branch should be used only for bug fixes or other 
maintenance to the 2.6.x version series.  Any new feature development should 
be done on trunk or on an independent "feature branch".

Let me know if you have any problems with updating to the new branch.

-- 
Jason Voegele
If you keep your mind sufficiently open, people will throw a lot of
rubbish into it.
                -- William Orton
_______________________________________________
tc-dev mailing list
[email protected]
http://lists.terracotta.org/mailman/listinfo/tc-dev

Reply via email to