From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Katsumi Yamaoka Newsgroups: gmane.emacs.devel Subject: Re: For insertion in trunk Date: Mon, 23 Apr 2012 11:01:40 +0900 Organization: Emacsen advocacy group Message-ID: References: <87sjfyqzhc.fsf@gmx.de> <87ty0dzdy0.fsf@gmx.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1335146526 30852 80.91.229.3 (23 Apr 2012 02:02:06 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 23 Apr 2012 02:02:06 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 23 04:02:05 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SM8bI-0002r0-1L for ged-emacs-devel@m.gmane.org; Mon, 23 Apr 2012 04:02:00 +0200 Original-Received: from localhost ([::1]:35714 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SM8bH-0001xC-2r for ged-emacs-devel@m.gmane.org; Sun, 22 Apr 2012 22:01:59 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:42593) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SM8bA-0001ws-JY for emacs-devel@gnu.org; Sun, 22 Apr 2012 22:01:56 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SM8b8-0003ee-Hr for emacs-devel@gnu.org; Sun, 22 Apr 2012 22:01:52 -0400 Original-Received: from orlando.hostforweb.net ([216.246.45.90]:52297) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SM8b8-0003e3-ES for emacs-devel@gnu.org; Sun, 22 Apr 2012 22:01:50 -0400 Original-Received: from localhost ([127.0.0.1]:55307) by orlando.hostforweb.net with smtp (Exim 4.69) (envelope-from ) id 1SM8b3-00042f-SC for emacs-devel@gnu.org; Sun, 22 Apr 2012 21:01:46 -0500 X-Face: #kKnN,xUnmKia.'[pp`; Omh}odZK)?7wQSl"4o04=EixTF+V[""w~iNbM9ZL+.b*_CxUmFk B#Fu[*?MZZH@IkN:!"\w%I_zt>[$nm7nQosZ<3eu; B:$Q_:p!',P.c0-_Cy[dz4oIpw0ESA^D*1Lw= L&i*6&( User-Agent: Gnus/5.130004 (=?iso-2022-jp?B?GyRCPz8bKEI=?= Gnus v0.4) Emacs/24.1.50 (i686-pc-cygwin) Cancel-Lock: sha1:y6FRa8v+CYjvEOCMJbHdEiVBukU= X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - orlando.hostforweb.net X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - jpl.org X-Source: X-Source-Args: X-Source-Dir: X-detected-operating-system: by eggs.gnu.org: Linux 2.6? (barebone, rare!) X-Received-From: 216.246.45.90 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:149945 Archived-At: Andreas Schwab wrote: > Michael Albinus 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 )