On Thu, Jan 26, 2017 at 1:19 AM Kyle Meyer <kyle@kyleam.com> wrote:
Rasmus <rasmus@gmx.us> writes:
We'd want at least one more release from maint, I think, so that'd be
9.0.5.

Would it be OK to sync the current stable 9.0.4, and keep on updating with each stable release as time comes? We never know, we might end up with even higher stable releases by the time emacs 26.1 is released.

I have been using emacs master and org master for ages now without any issues. So emacs master + org 9.0.4 should not cause any serious problems. The major issues I forsee are the few backward incompatible changes people might have to make when org changes from 8.2.x to 9.x (though all those changes are documented in ORG-NEWS).
 

On Thu, Jan 26, 2017 at 8:46 AM Rasmus <rasmus@gmx.us> wrote:
So would now be a good time to sync the Emacs master?  I guess the
appropriate way would be to make a new branch that can eventually be
merged. 

Going by the same argument as above, do you think that merging org maint into emacs master directly is that risky? org master + emacs master has been super-stable for me.
 
 
On Thu, Jan 26, 2017 at 9:22 AM Stefan Monnier <monnier@iro.umontreal.ca> wrote:
> So would now be a good time to sync the Emacs master?

On `master`, "now" is pretty much *always* a good time to sync.
More specifically, it's better to always keep `master` in sync with the
upstream (applies not just to Org).

"sync early, sync often",

+1! 

 
--

Kaushal Modi