From: Eli Zaretskii <eliz@gnu.org>
To: galli.87@gmail.com
Cc: emacs-devel@gnu.org
Subject: Re: feature freeze decision needed + bzr cherrypick?
Date: Sat, 29 Dec 2012 15:28:05 +0200 [thread overview]
Message-ID: <83ehi9kmxm.fsf@gnu.org> (raw)
In-Reply-To: <83fw2pkn5w.fsf@gnu.org>
> Date: Sat, 29 Dec 2012 15:23:07 +0200
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: emacs-devel@gnu.org
>
> > Date: Sat, 29 Dec 2012 10:16:04 -0300
> > From: Fabian Ezequiel Gallina <galli.87@gmail.com>
> >
> > Is there anything similar to git's cherrypick?
>
> Yes. Something like this:
>
> cd emacs-24
> bzr merge -r 111365..111367 ../trunk
> bzr ci -m "Backported revisions 111366 and 111367 from trunk."
Btw, bzr doesn't track cherrypicks, so the "Backported" part of the
commit message is important, as it is used by admin/bzrmerge.el to
exclude such revisions when the branch is merged onto the trunk.
next prev parent reply other threads:[~2012-12-29 13:28 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 [this message]
2012-12-29 13:34 ` Fabian Ezequiel Gallina
2012-12-30 1:31 ` Glenn Morris
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=83ehi9kmxm.fsf@gnu.org \
--to=eliz@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.