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

[Bastien]

Chong Yidong <address@hidden> writes:

> Bastien <address@hidden> writes:
>
>>> 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 see; that wasn't apparent to me from the last merge, which had stuff
> like the new face `org-date-selected'.  If the merge consists of just
> obviously-safe bugfixes, go ahead by all means.  Just be extra paranoid.

There are also some small documentation fixes.

I'm all for merging them too.  Let me know.

>>> 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?
>
> bzr merge FROM -c REVNO

Thanks!

-- 
 Bastien