From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Lars Magne Ingebrigtsen <larsi@gnus.org>
Cc: 18334@debbugs.gnu.org
Subject: bug#18334: 24.3.93; ImageMagick: eww shows favicon animations in search results
Date: Mon, 22 Sep 2014 15:26:15 -0400 [thread overview]
Message-ID: <jwv1tr3xxwy.fsf-monnier+bug#18334@gnu.org> (raw)
In-Reply-To: <m361ghjhmq.fsf@stories.gnus.org> (Lars Magne Ingebrigtsen's message of "Sun, 21 Sep 2014 14:13:49 +0200")
> Could you do a merge with trunk? >"?
Not sure what you mean by that. But I just sync'd the trunk with the
emacs-24 branch. In case you wonder how to do that.
Well, you can do "bzr merge .../emacs-24" of course, but in order to
handle a few details and avoid some spurious conflicts, you can instead
use
- M-x load RET .../trunk/admin/bzrmerge.el RET
- M-x cd RET .../trunk RET
- Mx- bzrmerge RET .../emacs-24 RET
which will guess at some commits that don't need to be merged (e.g. because
its commit message says that it's a backport) and ask you for
confirmation that these should indeed be skipped.
Stefan
prev parent reply other threads:[~2014-09-22 19:26 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-27 0:57 bug#18334: 24.3.93; ImageMagick: eww shows favicon animations in search results YAMAMOTO Mitsuharu
2014-09-14 7:42 ` YAMAMOTO Mitsuharu
2014-09-14 18:20 ` Glenn Morris
2014-09-15 0:10 ` Glenn Morris
2014-09-17 22:45 ` Juri Linkov
2014-09-18 16:48 ` Lars Magne Ingebrigtsen
2014-09-18 19:22 ` Lars Magne Ingebrigtsen
2014-09-18 21:02 ` Juri Linkov
2014-09-20 21:57 ` Glenn Morris
2014-09-21 12:13 ` Lars Magne Ingebrigtsen
2014-09-21 13:50 ` Glenn Morris
2014-09-22 19:26 ` Stefan Monnier [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='jwv1tr3xxwy.fsf-monnier+bug#18334@gnu.org' \
--to=monnier@iro.umontreal.ca \
--cc=18334@debbugs.gnu.org \
--cc=larsi@gnus.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 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.