From: Eli Zaretskii <eliz@gnu.org>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: emacs-devel@gnu.org
Subject: Re: Marking changes to be backported
Date: Mon, 06 Oct 2014 18:16:32 +0300 [thread overview]
Message-ID: <83fvf1mdnz.fsf@gnu.org> (raw)
In-Reply-To: <jwvegulnxnr.fsf-monnier+emacsbugs@gnu.org>
> From: Stefan Monnier <monnier@iro.umontreal.ca>
> Date: Mon, 06 Oct 2014 09:25:49 -0400
> Cc: Emacs developers <emacs-devel@gnu.org>
>
> > 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?),
>
> One way or another, someone will have to decide which change goes "in
> the current pretest" (let's call it 24.4), "in the next bug-fix" (let's
> call it 24.5), or "longer term" (let's call it 25.1).
The dilemma is only between the 2 out of 3 branches, those that get
bugfixes. One of them should only get very safe fixes for serious
problems, which should then be merged to the other.
As for trunk vs the other 2 branches, I think the decision is simple:
new features and changes that don't fix bugs go to trunk only.
next prev parent reply other threads:[~2014-10-06 15:16 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 [this message]
2014-10-06 18:49 ` Glenn Morris
2014-10-06 19:12 ` Stefan Monnier
2014-10-06 15:09 ` Eli Zaretskii
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=83fvf1mdnz.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
/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.