* What's the convention for committing bug fixes?
@ 2014-04-17 18:50 Alan Mackenzie
2014-04-17 20:01 ` Eli Zaretskii
0 siblings, 1 reply; 3+ messages in thread
From: Alan Mackenzie @ 2014-04-17 18:50 UTC (permalink / raw)
To: emacs-devel
Hello, Emacs.
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?
For recent previous releases, the convention was to commit to the
release branch and somebody dedicated and energetic copied the commit to
the trunk.
Sorry if this has already been discussed and I somehow missed it.
--
Alan Mackenzie (Nuremberg, Germany).
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: What's the convention for committing bug fixes?
2014-04-17 18:50 What's the convention for committing bug fixes? Alan Mackenzie
@ 2014-04-17 20:01 ` Eli Zaretskii
2014-04-17 22:17 ` Alan Mackenzie
0 siblings, 1 reply; 3+ messages in thread
From: Eli Zaretskii @ 2014-04-17 20:01 UTC (permalink / raw)
To: Alan Mackenzie; +Cc: emacs-devel
> Date: Thu, 17 Apr 2014 18:50:15 +0000
> From: Alan Mackenzie <acm@muc.de>
>
> 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").
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: What's the convention for committing bug fixes?
2014-04-17 20:01 ` Eli Zaretskii
@ 2014-04-17 22:17 ` Alan Mackenzie
0 siblings, 0 replies; 3+ messages in thread
From: Alan Mackenzie @ 2014-04-17 22:17 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: emacs-devel
Hi, Eli.
On Thu, Apr 17, 2014 at 11:01:31PM +0300, Eli Zaretskii wrote:
> > Date: Thu, 17 Apr 2014 18:50:15 +0000
> > From: Alan Mackenzie <acm@muc.de>
> > 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").
Thanks!
--
Alan Mackenzie (Nuremberg, Germany).
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-04-17 22:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-17 18:50 What's the convention for committing bug fixes? Alan Mackenzie
2014-04-17 20:01 ` Eli Zaretskii
2014-04-17 22:17 ` Alan Mackenzie
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).