From: Glenn Morris <rgm@gnu.org>
To: "Óscar Fuentes" <ofv@wanadoo.es>
Cc: emacs-devel@gnu.org
Subject: Re: [RFC] Correctly handling MinGW-w64
Date: Mon, 17 Nov 2014 22:31:04 -0500 [thread overview]
Message-ID: <wkzjbp18xz.fsf@fencepost.gnu.org> (raw)
In-Reply-To: 874mtxpj18.fsf@wanadoo.es
Óscar Fuentes wrote:
>> How about applying to both (with a suitable "don't merge to trunk"
>> note on emacs-24)?
>
> Not sure how to do that on an effective way.
Write "do not merge to trunk" in the commit log.
(And then wait for someone to implement a bzrmerge.el replacement so
that actually does something.)
> Pushed the change to emacs-24. Let's see how it fares after the next
> merge.
Ah yes, the "Somebody Else's Problem" method! :)
(The ideal solution would be for you to now merge emacs-24 to trunk and
resolve the conflicts yourself.)
next prev parent reply other threads:[~2014-11-18 3:31 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-17 3:24 [RFC] Correctly handling MinGW-w64 Óscar Fuentes
2014-11-17 4:04 ` Paul Eggert
2014-11-17 4:13 ` Óscar Fuentes
2014-11-17 4:32 ` Paul Eggert
2014-11-17 14:59 ` Óscar Fuentes
2014-11-17 15:18 ` Paul Eggert
2014-11-17 15:42 ` Óscar Fuentes
2014-11-17 15:59 ` Eli Zaretskii
2014-11-17 18:23 ` Óscar Fuentes
2014-11-17 18:48 ` Eli Zaretskii
2014-11-17 19:04 ` Óscar Fuentes
2014-11-17 19:31 ` Eli Zaretskii
2014-11-17 22:19 ` Óscar Fuentes
2014-11-18 3:31 ` Glenn Morris [this message]
2014-11-18 3:50 ` Óscar Fuentes
2014-11-18 14:50 ` Stefan Monnier
2014-11-18 3:35 ` Eli Zaretskii
2014-11-17 15:57 ` Eli Zaretskii
2014-11-17 16:03 ` Paul Eggert
2014-11-17 16:34 ` Eli Zaretskii
2014-11-17 15:55 ` Eli Zaretskii
2014-11-17 16:02 ` Paul Eggert
2014-11-17 16:33 ` Eli Zaretskii
2014-11-17 4:05 ` Óscar Fuentes
2014-11-17 15:52 ` Eli Zaretskii
2014-11-17 15:51 ` Eli Zaretskii
2014-11-17 16:04 ` Óscar Fuentes
2014-11-17 16:35 ` Eli Zaretskii
2014-11-17 17:34 ` Óscar Fuentes
2014-11-18 8:24 ` Stephen Leake
2014-11-18 15:50 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=wkzjbp18xz.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=ofv@wanadoo.es \
/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.