Re: Next release

[Jason Rumney]

Nick Roberts wrote:
>  > If bugs are present in EMACS_22_BASE, they should be fixed there. 
>
> They should but the reality is that they aren't.  It's more work to commit
> changes to two separate branches

So just commit them to the EMACS_22_BASE branch, and let the automated 
merge take care of them.  If the code has diverged enough to upset the 
automated merge, then it probably isn't worth the effort of fixing in 
Emacs 22 unless the bug is serious, but for most bugs the merge should 
take care of things.