facebook-xmpp merged into adium-1.4
lists at durin42.com
Sun Jun 26 03:26:42 UTC 2011
On Jun 25, 2011, at 4:10 PM, Evan Schoenberg, M.D. wrote:
> On Jun 25, 2011, at 11:25 AM, Augie Fackler wrote:
>> Just saw this thread, and FWIW that looks like the right transplant spell to me. If it gives you trouble, #mercurial on freenode can probably help, and I'll take a shot at it if you put me on the To or CC line in a follow up to this thread (I may not see it if I'm not on to/cc).
> Thanks for the offer. I ended up being able to get it mostly working with the transplant spell given; it just took a lot of manual merge management because it was a transplant across repositories.
> On that note, we are not using separate repositories for dev vs. bugfix branches once adium-1.4 is done. I hate it.
Yeah, it's definitely an antipattern. If I could go back and change history, I'd have put together some synthetic revisions so that Adium 1.4 and 1.5 could at least be vaguely related and make this kind of thing easier.
Hindsight is 20/20, I suppose.
More information about the devel