Re: Is the 2012-04-01 Update to Org version 7.8.07 incomplete?

[Bastien]

Chong Yidong <address@hidden> writes:

> Bastien <address@hidden> writes:
>
>> Okay.  This is now both in the maint branch and the master branch of
>> the git repository of Org-mode.  The maint branch will be merged into
>> Emacs before the next Emacs pretest -- which AFAIK is not planned yet.
>
> There may not be a next pretest, only the release candidate.  

Yes, that's what I meant, sorry.

> In any case, this late in the pretest process I'm not sure another big
> merge from Org upstream is appropriate.

"Org upstream" is either the maint branch or the master branch:
I plan to merge changes from the maint branch, which are mainly
bug fixes.  I don't plan to merge changes from master.

I will send a patch first.

> If there is a critical bug that needs to be fixed, cherry-pick it into
> the emacs-24 branch.  Other fixes should go into the trunk.

You mean "manually cherry-pick"?  Is there a simple way to cherry-pick
with bzr?

-- 
 Bastien