all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Katsumi Yamaoka <yamaoka@jpl.org>
To: emacs-devel@gnu.org
Subject: Re: For insertion in trunk
Date: Mon, 23 Apr 2012 11:01:40 +0900	[thread overview]
Message-ID: <b4mty0bjjej.fsf@jpl.org> (raw)
In-Reply-To: m2hawdfmx1.fsf@igel.home

Andreas Schwab wrote:
> Michael Albinus <michael.albinus@gmx.de> writes:

>> After installation of my changes, it would be almost impossible to merge
>> dbusbind.c or dbus.el automatically between the emacs24 branch and the trunk.

> That's not a problem if the files aren't changed on the emacs-24 branch.

In relation to this, I'd like to merge changes made in the Gnus
git master ever since the feature freeze to the Emacs trunk.  In
that work, may I not change the original ChangeLog timestamps
(and order)?  Or should they be changed to the present time (and
put at the beginning)?

A patch is ready as:
http://www.jpl.org/ftp/pub/tmp/MaGnus-to-Emacs.patch
(or ftp://ftp.jpl.org/pub/tmp/MaGnus-to-Emacs.patch )



  reply	other threads:[~2012-04-23  2:01 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-20 13:55 For insertion in trunk Michael Albinus
2012-04-21  2:12 ` Stefan Monnier
2012-04-21  8:23   ` Michael Albinus
2012-04-21  8:11 ` Lars Magne Ingebrigtsen
2012-04-21  8:28   ` Michael Albinus
2012-04-21  9:34     ` Andreas Schwab
2012-04-23  2:01       ` Katsumi Yamaoka [this message]
2012-04-23  8:41         ` Lars Magne Ingebrigtsen
2012-04-23  9:23           ` Katsumi Yamaoka
2012-06-22 11:46             ` Katsumi Yamaoka
2012-06-24  9:11               ` Chong Yidong
2012-06-26 22:55                 ` Katsumi Yamaoka
2012-06-27  0:09                   ` Glenn Morris
2012-06-27  0:47                     ` Katsumi Yamaoka
2012-06-27  1:24                       ` Glenn Morris
2012-06-27  3:49                         ` Katsumi Yamaoka
2012-06-27  6:58                           ` Glenn Morris
2012-06-29  4:16                             ` Katsumi Yamaoka

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=b4mty0bjjej.fsf@jpl.org \
    --to=yamaoka@jpl.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 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.