[Adium-devl] Branches -> Trunk

[Augie Fackler]

On Aug 18, 2007, at 11:29 PM, Colin Barrett wrote:

> On Aug 18, 2007, at 1:57 PM, David Smith wrote:
>
>> 5) Merge the bonjour branch early since it's pretty isolated from the
>> rest of the code.
>
> I'd say why not merge it just "whenever"? The more branches you  
> merge in the greater distance from trunk, but since it's pretty  
> isolated it shouldn't matter,  right?

Bonjour is really stable - I'd like to get it merged first thing.
I'll be honest for a moment: I've been using that branch for my day- 
to-day, not trunk. Bonjour has its
advantages on a college campus.
FWIW, I can run actual merges as needed - I have SVN with interactive  
merging (trunk plus a local patch I'm cleaning up for submission), so  
it takes me fairly little time. Should I run a merge from trunk to  
the branches on Monday?
Augie


>
> Other than that, sounds like a fine plan.
>
> -Colin_______________________________________________
> Adium-devl mailing list
> Adium-devl at adiumx.com
> http://adiumx.com/mailman/listinfo/adium-devl_adiumx.com