From: Ted Zlatanov <tzz@lifelogs.com>
To: emacs-devel@gnu.org
Subject: Re: master c6f03ed: Fix a problem in url.el without GnuTLS
Date: Fri, 12 Dec 2014 19:25:38 -0500 [thread overview]
Message-ID: <87oar81jlp.fsf@lifelogs.com> (raw)
In-Reply-To: 83a92trlgs.fsf@gnu.org
On Fri, 12 Dec 2014 16:28:35 +0200 Eli Zaretskii <eliz@gnu.org> wrote:
EZ> No need to fear, just remember to review what "git show" displays,
EZ> after the merge and before you push. If it doesn't look OK to you,
EZ> you can always reset to cancel the merge.
Yup. I did it, carefully.
On Fri, 12 Dec 2014 11:06:03 -0500 Stefan Monnier <monnier@iro.umontreal.ca> wrote:
>>> I can attempt another merge of the emacs-24 branch... with fear :)
SM> Don't forget to use gitmerge.el.
Right, thanks. It works well.
On Fri, 12 Dec 2014 21:46:05 +0100 Lars Magne Ingebrigtsen <larsi@gnus.org> wrote:
LMI> Ted Zlatanov <tzz@lifelogs.com> writes:
>> It should get merged into master soon. I can attempt another merge of
>> the emacs-24 branch... with fear :)
LMI> Oops. I didn't notice that this fix went into the emacs-24 branch, so I
LMI> removed the `fboundp' checks from the trunk. Which means that trunk
LMI> doesn't work for people without gnutls support.
LMI> So if you could do the merge, that would be nice, otherwise I'll have to
LMI> re-revert those `fboundp' changes again.
It's merged. Sorry for the delay.
Ted
next prev parent reply other threads:[~2014-12-13 0:25 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20141211155740.11916.1584@vcs.savannah.gnu.org>
[not found] ` <E1Xz67Y-00036o-Vf@vcs.savannah.gnu.org>
2014-12-11 16:47 ` master c6f03ed: Fix a problem in url.el without GnuTLS Leo Liu
2014-12-11 18:08 ` Eli Zaretskii
2014-12-11 23:00 ` Ted Zlatanov
2014-12-12 9:23 ` Eli Zaretskii
2014-12-12 13:24 ` Ted Zlatanov
2014-12-12 14:28 ` Eli Zaretskii
2014-12-12 16:06 ` Stefan Monnier
2014-12-13 0:25 ` Ted Zlatanov [this message]
2014-12-13 0:28 ` Lars Magne Ingebrigtsen
2014-12-13 1:25 ` Ted Zlatanov
2014-12-13 8:04 ` Eli Zaretskii
2014-12-13 10:16 ` David Engster
2014-12-18 22:38 ` David Engster
2014-12-19 8:50 ` Eli Zaretskii
2014-12-13 9:04 ` David Engster
2014-12-13 9:50 ` David Engster
2014-12-13 13:19 ` Ted Zlatanov
2014-12-13 14:13 ` David Engster
2014-12-13 14:25 ` Ted Zlatanov
2014-12-13 15:18 ` Eli Zaretskii
2014-12-13 19:44 ` David Engster
2014-12-13 19:59 ` Eli Zaretskii
2014-12-13 22:00 ` Dmitry Gutov
2014-12-14 3:36 ` Eli Zaretskii
2014-12-13 23:13 ` David Engster
2014-12-14 16:09 ` Eli Zaretskii
2014-12-14 16:37 ` Ted Zlatanov
2014-12-14 16:55 ` Eli Zaretskii
2014-12-14 17:00 ` Ted Zlatanov
2014-12-14 23:21 ` Stefan Monnier
2014-12-14 17:46 ` Paul Eggert
2014-12-14 17:50 ` Eli Zaretskii
2014-12-14 18:28 ` Ted Zlatanov
2014-12-14 19:41 ` David Engster
2014-12-14 21:40 ` David Engster
2014-12-15 3:47 ` Eli Zaretskii
2014-12-15 20:39 ` David Engster
2014-12-16 19:42 ` Eli Zaretskii
2014-12-17 9:58 ` Steinar Bang
2014-12-17 10:52 ` Steinar Bang
2014-12-17 15:36 ` Eli Zaretskii
2014-12-17 15:35 ` Eli Zaretskii
2014-12-17 20:37 ` David Engster
2014-12-18 4:55 ` Stephen J. Turnbull
2014-12-18 15:39 ` Eli Zaretskii
2014-12-18 20:00 ` Steinar Bang
2014-12-18 20:40 ` Eli Zaretskii
2014-12-19 8:09 ` Steinar Bang
2014-12-19 9:16 ` Eli Zaretskii
2014-12-19 10:33 ` Steinar Bang
2014-12-18 21:18 ` David Engster
2014-12-18 15:38 ` Eli Zaretskii
2014-12-18 19:46 ` Steinar Bang
2014-12-18 20:35 ` Eli Zaretskii
2014-12-19 6:07 ` Yuri Khan
2014-12-19 7:57 ` Steinar Bang
2014-12-19 9:09 ` Eli Zaretskii
2014-12-18 20:46 ` David Engster
2014-12-14 22:42 ` Stefan Monnier
2014-12-15 3:37 ` Eli Zaretskii
2014-12-15 4:46 ` Stefan Monnier
2014-12-12 20:46 ` Lars Magne Ingebrigtsen
2014-12-12 0:30 ` Leo Liu
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=87oar81jlp.fsf@lifelogs.com \
--to=tzz@lifelogs.com \
--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).