[Adium-devl] Merges to Branches
eagleeye87 at gmail.com
Thu Jul 12 04:05:54 UTC 2007
I can't think of anything that the Bonjour messaging branch would
need from trunk so feel free to leave that branch unmnerged.
On Jul 11, 2007, at 6:03 PM, Augie Fackler wrote:
> 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.
> 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.
>>> probably start in about 2 hours.
>>> Adium-devl mailing list
>>> Adium-devl at adiumx.com
>> Adium-devl mailing list
>> Adium-devl at adiumx.com
> Adium-devl mailing list
> Adium-devl at adiumx.com
More information about the Adium-devl