[Adium-devl] Merges to Branches

Augie Fackler lists at durin42.com
Wed Jul 11 22:03:01 UTC 2007


IMPORTANT: If you want a merge (applescript, multi-user-chat this  
means you) from trunk (includes Andy's awesome XMPP work to date),  
you must ask me directly, either here or offlist. Me "just doing"  
merges isn't happening pending some research against a potential bug  
in subversion.

Long Update:
Merges didn't get done - there's something wonky in our version  
history (probably) that complicates the process.
If you *need* a merge to work on a feature, tell me and I'll do the  
work to make it happen, but I'd like to keep one branch unmerged if  
possible so that the svn guys and I can play with this and figure out  
what's going on.
Thanks,
Augie

On Jul 11, 2007, at 11:37 AM, Augie Fackler wrote:

> Operating on the assumption that I've not heard any objections, I'm
> going to have svn start computing the merges so that I can run the
> commit after lunch.
>
> On Jul 11, 2007, at 10:28 AM, Augie Fackler wrote:
>
>> I'm going to merge trunk out to the SoC branches and kill the xmpp
>> branch since it's on trunk now unless anyone has any objections. I'll
>> probably start in about 2 hours.
>>
>> Augie
>>
>>
>> _______________________________________________
>> Adium-devl mailing list
>> Adium-devl at adiumx.com
>> http://adiumx.com/mailman/listinfo/adium-devl_adiumx.com
>
>
> _______________________________________________
> Adium-devl mailing list
> Adium-devl at adiumx.com
> http://adiumx.com/mailman/listinfo/adium-devl_adiumx.com





More information about the devel mailing list