[Adium-devl] Status of the 1.2svn search field?

[Evan Schoenberg]

On Sep 5, 2007, at 1:25 PM, Peter Hosey wrote:

> On Sep 05, 2007, at 09:23:12, Chris Forsythe wrote:
>> 1) Augie is doing merges tomorrow morning
>>
>> 2) Branching trunk prior to the merges is crucial
>
> Are we talking about merging trunk to the branches, or branches to  
> the trunk?

Both, with the former being a prelim step for the latter. Augie wrote  
to me off-list:
> The process basically means we merge trunk to the branch to make them
> in sync, then merge the branch back to trunk. In theory, it's a
> totally painless process. sussman (or some other svn'er) will
> definitely help us out if it turns out to be Hard.

-Evan