* Re: [Emacs-diffs] emacs-24 r117695: Fix bug #18995 with compiling w32heap.c with -funroll-loops.
[not found] <E1XnUsw-0000vL-Au@vcs.savannah.gnu.org>
@ 2014-11-10 7:41 ` Glenn Morris
2014-11-10 10:50 ` Eli Zaretskii
0 siblings, 1 reply; 6+ messages in thread
From: Glenn Morris @ 2014-11-10 7:41 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: emacs-devel
There seemed no earthly way to apply this to trunk, so I just dropped it.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Emacs-diffs] emacs-24 r117695: Fix bug #18995 with compiling w32heap.c with -funroll-loops.
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
0 siblings, 1 reply; 6+ messages in thread
From: Eli Zaretskii @ 2014-11-10 10:50 UTC (permalink / raw)
To: Glenn Morris; +Cc: emacs-devel
> From: Glenn Morris <rgm@gnu.org>
> Cc: emacs-devel@gnu.org
> Date: Mon, 10 Nov 2014 02:41:58 -0500
>
>
> There seemed no earthly way to apply this to trunk, so I just dropped it.
The trunk doesn't have the code which this fixed, so dropping it is
exactly right. Thanks.
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?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Emacs-diffs] emacs-24 r117695: Fix bug #18995 with compiling w32heap.c with -funroll-loops.
2014-11-10 10:50 ` Eli Zaretskii
@ 2014-11-10 16:55 ` Glenn Morris
2014-11-10 17:05 ` Eli Zaretskii
0 siblings, 1 reply; 6+ messages in thread
From: Glenn Morris @ 2014-11-10 16:55 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: emacs-devel
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Emacs-diffs] emacs-24 r117695: Fix bug #18995 with compiling w32heap.c with -funroll-loops.
2014-11-10 16:55 ` Glenn Morris
@ 2014-11-10 17:05 ` Eli Zaretskii
2014-11-10 19:40 ` Glenn Morris
0 siblings, 1 reply; 6+ messages in thread
From: Eli Zaretskii @ 2014-11-10 17:05 UTC (permalink / raw)
To: Glenn Morris; +Cc: emacs-devel
> From: Glenn Morris <rgm@gnu.org>
> Cc: emacs-devel@gnu.org
> Date: Mon, 10 Nov 2014 11:55:07 -0500
>
> 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.
OK, will do (for about a day that's left).
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-11-10 19:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[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
2014-11-10 17:05 ` Eli Zaretskii
2014-11-10 19:40 ` Glenn Morris
2014-11-10 19:59 ` Eli Zaretskii
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).