From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: For insertion in trunk Date: Sat, 21 Apr 2012 11:34:50 +0200 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 X-Trace: dough.gmane.org 1335000915 21672 80.91.229.3 (21 Apr 2012 09:35:15 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 21 Apr 2012 09:35:15 +0000 (UTC) Cc: Lars Magne Ingebrigtsen , emacs-devel@gnu.org To: Michael Albinus Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 21 11:35:14 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 1SLWim-0001SL-Nz for ged-emacs-devel@m.gmane.org; Sat, 21 Apr 2012 11:35:12 +0200 Original-Received: from localhost ([::1]:39406 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SLWil-0005qW-Vt for ged-emacs-devel@m.gmane.org; Sat, 21 Apr 2012 05:35:11 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:56208) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SLWig-0005nL-Ie for emacs-devel@gnu.org; Sat, 21 Apr 2012 05:35:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SLWib-0004t3-UU for emacs-devel@gnu.org; Sat, 21 Apr 2012 05:35:06 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.9]:56361) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SLWib-0004m1-O8 for emacs-devel@gnu.org; Sat, 21 Apr 2012 05:35:01 -0400 Original-Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3VZTL34Rgrz4Kn8p; Sat, 21 Apr 2012 11:34:51 +0200 (CEST) Original-Received: from igel.home (ppp-88-217-127-121.dynamic.mnet-online.de [88.217.127.121]) by mail.mnet-online.de (Postfix) with ESMTPA id 3VZTL343Mvz4KK2m; Sat, 21 Apr 2012 11:34:51 +0200 (CEST) Original-Received: by igel.home (Postfix, from userid 501) id BF56CCA2A0; Sat, 21 Apr 2012 11:34:50 +0200 (CEST) X-Yow: Sometime in 1993 NANCY SINATRA will lead a BLOODLESS COUP on GUAM!! In-Reply-To: <87ty0dzdy0.fsf@gmx.de> (Michael Albinus's message of "Sat, 21 Apr 2012 10:28:23 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.95 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 212.18.0.9 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:149898 Archived-At: 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. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."