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: master c6f03ed: Fix a problem in url.el without GnuTLS Date: Sun, 14 Dec 2014 18:55:35 +0200 Message-ID: <83egs241dk.fsf@gnu.org> References: <20141211155740.11916.1584@vcs.savannah.gnu.org> <87ppbquo97.fsf@gmail.com> <83zjaurreb.fsf@gnu.org> <874mt14wrc.fsf@lifelogs.com> <83egs5rzlr.fsf@gnu.org> <877fxx2e6t.fsf@lifelogs.com> <83a92trlgs.fsf@gnu.org> <87oar81jlp.fsf@lifelogs.com> <87bnn7rkcq.fsf@engster.org> <877fxvri96.fsf@engster.org> <87zjarznzs.fsf@lifelogs.com> <87sigjpri2.fsf@engster.org> <838uib60jv.fsf@gnu.org> <87mw6rpc6l.fsf@engster.org> <83sigj48z5.fsf@gnu.org> <874mszp2i7.fsf@engster.org> <83iohe43hu.fsf@gnu.org> <87tx0yxk4i.fsf@lifelogs.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1418576184 11169 80.91.229.3 (14 Dec 2014 16:56:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 14 Dec 2014 16:56:24 +0000 (UTC) Cc: emacs-devel@gnu.org To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Dec 14 17:56:17 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 1Y0CSu-0001nO-N8 for ged-emacs-devel@m.gmane.org; Sun, 14 Dec 2014 17:56:16 +0100 Original-Received: from localhost ([::1]:36476 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0CSu-0007Ah-5v for ged-emacs-devel@m.gmane.org; Sun, 14 Dec 2014 11:56:16 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60135) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0CSc-0007Aa-QJ for emacs-devel@gnu.org; Sun, 14 Dec 2014 11:56:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0CSW-0002ZK-LW for emacs-devel@gnu.org; Sun, 14 Dec 2014 11:55:58 -0500 Original-Received: from mtaout28.012.net.il ([80.179.55.184]:55260) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0CSW-0002ZC-Dg for emacs-devel@gnu.org; Sun, 14 Dec 2014 11:55:52 -0500 Original-Received: from conversion-daemon.mtaout28.012.net.il by mtaout28.012.net.il (HyperSendmail v2007.08) id <0NGL00E0002DAB00@mtaout28.012.net.il> for emacs-devel@gnu.org; Sun, 14 Dec 2014 18:53:32 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout28.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NGL00EX10988C00@mtaout28.012.net.il> for emacs-devel@gnu.org; Sun, 14 Dec 2014 18:53:32 +0200 (IST) In-reply-to: <87tx0yxk4i.fsf@lifelogs.com> 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:180094 Archived-At: > From: Ted Zlatanov > Date: Sun, 14 Dec 2014 11:37:49 -0500 > > I think cherry-picking fixes from emacs-24 to master or vice-versa is > the best way: IMO, if we go for cherry-picking, then it's best to fix bugs on master and cherry-pick from there to emacs-24.