On 25 jun 2011, at 16:28, Evan Schoenberg, M.D. wrote: > > I did try that... > > It starts the merge at > > => hg log -r c5b0c0b0c141 > changeset: 2578:c5b0c0b0c141 > user: terminus@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 <co...@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
Yeah, I noticed the same. This: hg transplant --branch facebook-xmpp -s ../adium-1.4 --log f46d14768090::a0a460790cfe Eventually did it for me. But it required a lot of manual merges to Adium.xcodeproj, PurpleFacebookAccount.m and AIFacebookXMPPAccount.m. So it's probably better if someone more familiar with that code merges it, I mostly skipped those. Thijs
smime.p7s
Description: S/MIME cryptographic signature
