[Solar-talk] Preparing to merge ORM branch

[Antti Holvikari]

On 10/5/07, Paul M Jones <pmjones at solarphp.com> wrote:
> Hi guys --
>
> Good news:  it looks like ORM is ready to merge back to trunk.  Yay!
>
> Bad news:  This will break *a lot* of stuff if you are synced to
> trunk. Boo!
>
> So to help ease the transition, I'm thinking I need to make a new
> branch of trunk as it is now (just a plain copy), call it 0.28.1 or
> something, and then anyone synced to trunk can sync to that instead.
> Then I can merge the ORM branch to trunk so that nobody gets hurt in
> the process.
>
> Anybody have insight to the pros and cons of that plan?

Everybody who uses trunk knows that they're taking a risk. I think
there's no reason to create *yet* another branch. I say merge!

-- 
Antti Holvikari