Dave wrote:
On 5/24/07, Allen Gilliland <[EMAIL PROTECTED]> wrote:
> How about this: since we are basically done with Roller 4.0 features
> and we probably won't be adding any more, let's make the switch to the
> roller_4.0_newbackend branch now.
>
> svn mv trunk branches/roller_4.0_oldbackend
> svn mv branches/roller_4.0_newbackend trunk
after thinking about this a bit more i'm not sure this is the right way
to promote code from a branch into the trunk. i realize this is the
easy way to do it, but it seems to me that the trunk itself should
remain intact and only the changes from the branch will be merged into
the trunk.
Merging from branch to trunk is not that much harder and you're right
about those two advantages, so that's how I'll do it. First, I'll get
the branch in sync with trunk (I haven't done that in a couple days)
then I'll merge from branch to trunk.
Let me know when you are ready.
go for it, i have all my current work checked in.
-- Allen
- Dave
