On Nov 14, 2010, at 7:25 PM, Augie Fackler wrote: > > On Nov 14, 2010, at 9:04 PM, Peter Hosey wrote: > >> On Nov 14, 2010, at 19:01:48, Colin Barrett wrote: >>> Ah, thanks. My changes were a switch in XML apis for log reading (away from >>> CFXML which is deprecatedish) -- non-critical. I'll back them out, I guess? >>> Is there somewhere else they should go? >> >> >> I suggest you do the first part and not the second. >> >> Put the backout on top of Evan's commit for versioning up to 1.4.1b2, then >> update to your previous commit (your last merge) and make a new commit >> changing the version to 1.4.2hg. That will start a new, unnamed branch, >> which we can merge back in after 1.4.1 comes out. > > This sounds about right, without me having looked at your revision DAG.
Done. http://hg.adium.im/adium-1.4/graph/dede0e76a714 You'll want to operate on http://hg.adium.im/adium-1.4/rev/e549a5d6e6dd for other 1.4.1 stuff, I think (is this what hg bookmarks + pushkey stuff is good for?) -Colin
