From: Glenn Morris <rgm@gnu.org>
To: Fabian Ezequiel Gallina <galli.87@gmail.com>
Cc: Emacs-Devel devel <emacs-devel@gnu.org>
Subject: Re: feature freeze decision needed + bzr cherrypick?
Date: Sat, 29 Dec 2012 20:31:01 -0500 [thread overview]
Message-ID: <l81ue8tjfu.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <CABq4mQudJQAGoXQVx4JW6qYB8821Wwv-Y=VpjY6=6xTgz+E1Bg@mail.gmail.com> (Fabian Ezequiel Gallina's message of "Sat, 29 Dec 2012 10:16:04 -0300")
Fabian Ezequiel Gallina wrote:
> Today I just pushed two commits to the trunk that fix some bugs
> reported in the github bugtracker. Although I'm not sure if these
> bugs were originally regressions I think they are pretty elegible
> to be merged in the emacs 24 branch (especially the traceback
> mixup one):
>
> 1) https://github.com/fgallina/python.el/issues/122
> 2) https://github.com/fgallina/python.el/issues/123
Fine by me to put these in emacs-24.
Please give the new defcustom a :version "24.3" tag.
(I did wonder if the entire python defgroup should just get such a tag,
since it is essentially a new mode.)
> Now considering these are merged into the trunk, in the case any
> of these is accepted to be put into the emacs-24 branch how would
> I proceed to do such thing? Is there anything similar to git's
> cherrypick?
Eli already answered about "backport" being important. (It's generally
best to put things appropriate for emacs-24 in emacs-24 to start with,
then let them get merged to trunk "automatically".)
> cd emacs-24
> bzr merge -r 111365..111367 ../trunk
Remember to float the ChangeLog entry to the top of the file, with the
appropriate date (bzr's changelog_merge plugin can do the first part).
next prev parent reply other threads:[~2012-12-30 1:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-29 13:16 feature freeze decision needed + bzr cherrypick? Fabian Ezequiel Gallina
2012-12-29 13:23 ` Eli Zaretskii
2012-12-29 13:28 ` Eli Zaretskii
2012-12-29 13:34 ` Fabian Ezequiel Gallina
2012-12-30 1:31 ` Glenn Morris [this message]
2012-12-31 19:35 ` Fabian Ezequiel Gallina
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=l81ue8tjfu.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=galli.87@gmail.com \
/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.