From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: merging emacs-24 Date: Thu, 27 Nov 2014 20:55:31 +0200 Message-ID: <83wq6gmq1o.fsf@gnu.org> References: <87a93eavwt.fsf@lifelogs.com> <87wq6hap7v.fsf@lifelogs.com> <87k32hrdj5.fsf@engster.org> <87vbm0a6zv.fsf@engster.org> <8361e0o7ee.fsf@gnu.org> <87fvd4trzx.fsf@igel.home> <831tooo576.fsf@gnu.org> <87k32ga3dh.fsf@engster.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1417114538 13319 80.91.229.3 (27 Nov 2014 18:55:38 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 27 Nov 2014 18:55:38 +0000 (UTC) Cc: tzz@lifelogs.com, schwab@linux-m68k.org, monnier@IRO.UMontreal.CA, emacs-devel@gnu.org To: David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 27 19:55:30 2014 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 1Xu4Dw-000326-Ab for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 19:55:28 +0100 Original-Received: from localhost ([::1]:41226 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu4Dv-0002hy-Om for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 13:55:27 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54428) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu4Dn-0002hf-28 for emacs-devel@gnu.org; Thu, 27 Nov 2014 13:55:23 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xu4Di-0002yF-Ok for emacs-devel@gnu.org; Thu, 27 Nov 2014 13:55:19 -0500 Original-Received: from mtaout28.012.net.il ([80.179.55.184]:53779) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu4Di-0002y1-Gq for emacs-devel@gnu.org; Thu, 27 Nov 2014 13:55:14 -0500 Original-Received: from conversion-daemon.mtaout28.012.net.il by mtaout28.012.net.il (HyperSendmail v2007.08) id <0NFP00600O42YH00@mtaout28.012.net.il> for emacs-devel@gnu.org; Thu, 27 Nov 2014 20:52:43 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout28.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NFP0012ROFUSQ60@mtaout28.012.net.il>; Thu, 27 Nov 2014 20:52:43 +0200 (IST) In-reply-to: <87k32ga3dh.fsf@engster.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.184 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:178379 Archived-At: > From: David Engster > Cc: Andreas Schwab , tzz@lifelogs.com, monnier@IRO.UMontreal.CA, emacs-devel@gnu.org > Date: Thu, 27 Nov 2014 19:46:02 +0100 > > Eli Zaretskii writes: > >> From: Andreas Schwab > >> Cc: David Engster , tzz@lifelogs.com, > >> monnier@IRO.UMontreal.CA, emacs-devel@gnu.org > >> Date: Thu, 27 Nov 2014 19:31:30 +0100 > >> > >> > Thanks, but why on master and not on emacs-24? > >> > >> Why emacs-24? > > > > So that I have it no matter which branch is checked-out. > > You'll have to checkout master if you want to merge into it We had bzrmerge on both branches. > If you feel strongly about it, I can backport it. If I'm the only one who needs that, I can solve my problem myself.