From: Kelvin White <kwhite@gnu.org>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: Emacs development discussions <emacs-devel@gnu.org>
Subject: Re: merging revisions into emacs24 from trunk
Date: Thu, 6 Nov 2014 12:28:01 -0500 [thread overview]
Message-ID: <CAG-q9=Z+FCnKGHKj8RkC7EYiMpfvFFQct0OGONvXx+bJmYCB9g@mail.gmail.com> (raw)
In-Reply-To: <jwvbnokp9c6.fsf-monnier+emacs@gnu.org>
> Just somehow get the change you want to backport (e.g. "bzr diff .. | patch"
> or "bzr merge -r NN..MM" or even by hand) and commit it. It's that simple.
> The only trick is that the commit message should include the key word
> "backport" somewhere so that bzrmerge.el will know to skip it to avoid
> spurious merge conflicts when we try to merge emacs-24 back into trunk.
I imagined it would be simple just wanted to make sure I didn't miss anything.
I tried the latter and had many conflicts, so I created a patch with bzr diff.
I will commit it shortly, thanks.
prev parent reply other threads:[~2014-11-06 17:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-06 14:49 merging revisions into emacs24 from trunk Kelvin White
2014-11-06 16:32 ` Eli Zaretskii
2014-11-06 16:34 ` Eli Zaretskii
2014-11-06 16:46 ` Stefan Monnier
2014-11-06 17:28 ` Kelvin White [this message]
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAG-q9=Z+FCnKGHKj8RkC7EYiMpfvFFQct0OGONvXx+bJmYCB9g@mail.gmail.com' \
--to=kwhite@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 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).