From: Eli Zaretskii <eliz@gnu.org>
To: Glenn Morris <rgm@gnu.org>
Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org
Subject: Re: Marking changes to be backported
Date: Mon, 06 Oct 2014 18:09:54 +0300 [thread overview]
Message-ID: <83k34dmdz1.fsf@gnu.org> (raw)
In-Reply-To: <w2wq8dael1.fsf@fencepost.gnu.org>
> From: Glenn Morris <rgm@gnu.org>
> Date: Mon, 06 Oct 2014 02:37:30 -0400
> Cc: Emacs developers <emacs-devel@gnu.org>
>
> Stefan Monnier wrote:
>
> >> There needs to be an agreed convention to mark trunk changes that should
> >> be backported to the release branch at some later date. "Remember to do
> >> it" doesn't scale.
> >
> > If it's really needed, we can have a "emacs-24-next" branch for that.
>
> I think it will be needed if: there are to be pure bug-fix releases, and
> pretesting is going to continue to take months, and development is going
> to continue at the same time. (There are probably tons of things fixed
> in trunk today that should go into version 24.5, if there is one. Who's
> going to dig them all out and backport them? No-one.)
>
> > Then we merge emacs-24 into emacs-24-next, and then we merge
> > emacs-24-next into trunk.
>
> Yet more branches sounds more complicated to me (doesn't that mean you
> need to know when you make a change where it should go?), but I don't
> care about the system so long as there is one.
I think using another (3rd) branch is on balance the most reliable and
least error prone method. It is also much less effort to merge
between branches than to cherry-pick.
next prev parent reply other threads:[~2014-10-06 15:09 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-02 5:48 bug#18600: 24.3.94; EWW fails to check https certificates Mark H Weaver
2014-10-03 23:01 ` Glenn Morris
2014-10-03 23:44 ` Glenn Morris
2014-10-04 21:34 ` Ted Zlatanov
2014-10-04 23:24 ` Mark H Weaver
2014-10-05 2:00 ` Stefan Monnier
2014-10-05 2:38 ` Marking changes to be backported Glenn Morris
2014-10-05 16:46 ` Glenn Morris
2014-10-06 1:13 ` Stefan Monnier
2014-10-06 6:37 ` Glenn Morris
2014-10-06 13:25 ` Stefan Monnier
2014-10-06 15:16 ` Eli Zaretskii
2014-10-06 18:49 ` Glenn Morris
2014-10-06 19:12 ` Stefan Monnier
2014-10-06 15:09 ` Eli Zaretskii [this message]
2014-10-05 17:17 ` bug#18600: 24.3.94; EWW fails to check https certificates Mark H Weaver
2014-10-05 2:16 ` Glenn Morris
2014-11-23 17:10 ` Lars Magne Ingebrigtsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83k34dmdz1.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
--cc=rgm@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.