yes. the current active code is the 3.0 branch, we just haven't merged
it into the trunk yet.
-- Allen
Jeff Blattman wrote:
okay ... so, i assume then that i should merge the changes from the
trunk into the 3.0 branch (for the adminapi stuff), and just be working
from the 3.0 branch.
thanks.
Dave Johnson wrote:
On 8/31/06, Jeff Blattman <[EMAIL PROTECTED]> wrote:
this is my fault for not paying attention, but what again is the plan w/
regard to roller 3.0 and trunk merge? will there be a roller 2.3.1? or
just a 3.1 which is 3.0 merged to the trunk?
Roller 2.3.1 is in RC now, it's just a small security fix release that
still lacks the votes for release.
I was assuming we'd release Roller 3.0 from the roller_3.0 branch,
then we'd do something like the below to make 3.0 the trunki:
svn mv trunk branches/roller_2.4
svn cp -r branches/roller_3.0 trunk
- Dave
