On 25 jun 2011, at 16:20, 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. > > (On a side note, if you get an error like: > > abort: 00changelog.i@fc46a50b0458: no node! > > You need to run "hg transplant --continue -s ../adium-1.4", instead of just > "hg transplant --continue".) > > Thijs
Hmm, okay, it isn't really working. Looking at it now, it seems to try to transplant 2 year old changesets, and not just the facebook-xmpp branch. So it's mostly failing because all those changes were applied already...
smime.p7s
Description: S/MIME cryptographic signature
