From: Glenn Morris <rgm@gnu.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: [Emacs-diffs] emacs-24 r117695: Fix bug #18995 with compiling w32heap.c with -funroll-loops.
Date: Mon, 10 Nov 2014 11:55:07 -0500 [thread overview]
Message-ID: <uamw7zyp04.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <838ujjnxbi.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 10 Nov 2014 12:50:57 +0200")
Eli Zaretskii wrote:
> When I committed it to the branch, I debated how to indicate that it
> doesn't need to be applied to trunk, but there doesn't seem to be
> anything to support that in bzrmerge.el. Did I miss something?
Just write "No need to merge to trunk" in the commit log.
Anything that matches bzrmerge-skip-regexp, to make the merger take note.
next prev parent reply other threads:[~2014-11-10 16:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <E1XnUsw-0000vL-Au@vcs.savannah.gnu.org>
2014-11-10 7:41 ` [Emacs-diffs] emacs-24 r117695: Fix bug #18995 with compiling w32heap.c with -funroll-loops Glenn Morris
2014-11-10 10:50 ` Eli Zaretskii
2014-11-10 16:55 ` Glenn Morris [this message]
2014-11-10 17:05 ` Eli Zaretskii
2014-11-10 19:40 ` Glenn Morris
2014-11-10 19:59 ` Eli Zaretskii
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=uamw7zyp04.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=eliz@gnu.org \
--cc=emacs-devel@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 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).