facebook-xmpp merged into adium-1.4

[Evan Schoenberg, M.D.]

On Jun 25, 2011, at 9:20 AM, Thijs Alkemade wrote:

> On 25 jun 2011, at 16:04, Evan Schoenberg, M.D. wrote:
> 
>> 
>> On Jun 24, 2011, at 6:20 PM, Evan Schoenberg, M.D. wrote:
>> 
>>> Could someone please figure out how to transplant the changes into the adium repository? Thanks.
>> 
>> OK, I spent an hour looking into this this morning. As far as I can tell, the only way to do this is to manually transplant each commit that was done on the branch.  Impossibly broken process.  Can anyone suggest something better?
>> 
>> -Evan
> 
> Looking at `hg help transplant`, have you tried:
> 
> $ hg transplant --branch facebook-xmpp --log --all -s ../adium-1.4
> 
> It needs manual merging every couple of commits for me, but it seems to work.

I did try that...

It starts the merge at 

=> hg log -r c5b0c0b0c141
changeset:   2578:c5b0c0b0c141
user:        terminus at Aleph.local
date:        Tue Aug 11 23:58:06 2009 +0400
summary:     Cherry-picked 3855f70905bd from adium:

which is a 2009 cherry pick of a change from adium to adium-1.4 and is not involved in the branch.

If it is merging the branch, it should start at:

changeset:   3381:f46d14768090
branch:      facebook-xmpp
user:        Colin Barrett <colin at springsandstruts.com>
date:        Sun Mar 06 17:09:40 2011 -0800
summary:     First pass at Facebook XMPP. Definitely **NOT** ready for actual use, but it does connect.

which is the commit which created the branch.

We definitely don't want every adium-1.4 change reapplied to the adium repository.

-Evan


> 
> (On a side note, if you get an error like:
> 
> abort: 00changelog.i at fc46a50b0458: no node!
> 
> You need to run "hg transplant --continue -s ../adium-1.4", instead of just "hg transplant --continue".)
> 
> Thijs