Re: What's the convention for committing bug fixes?

[Eli Zaretskii]

> Date: Thu, 17 Apr 2014 18:50:15 +0000
> From: Alan Mackenzie <address@hidden>
> 
> For bug fixes which should go into both Emacs 24.4 and the trunk, where
> should they be committed?  Into the 24.4 branch, into the trunk, or into
> both?

On the branch.  They are then merged to the trunk.

> For recent previous releases, the convention was to commit to the
> release branch and somebody dedicated and energetic copied the commit to
> the trunk.

It's still that way.  Of course, you can become one of those dedicated
and energetic persons yourself, the procedure is in admin/notes/bzr
(except that it calls the release branch "emacs-23").