From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Merging changes from emacs-24 to master Date: Sat, 15 Nov 2014 22:58:21 -0500 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416110341 2499 80.91.229.3 (16 Nov 2014 03:59:01 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 16 Nov 2014 03:59:01 +0000 (UTC) Cc: Emacs development discussions To: Christoph Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 16 04:58:51 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 1XpqzB-0000VU-Af for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 04:58:49 +0100 Original-Received: from localhost ([::1]:42705 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpqzA-0000zc-O1 for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 22:58:48 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52429) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpqyr-0000zU-VI for emacs-devel@gnu.org; Sat, 15 Nov 2014 22:58:37 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xpqyk-0002OH-FY for emacs-devel@gnu.org; Sat, 15 Nov 2014 22:58:29 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:31014) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpqyk-0002OB-CO for emacs-devel@gnu.org; Sat, 15 Nov 2014 22:58:22 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AscIAGA2ZVSnWBqE/2dsb2JhbABbgw6KYssJAwQCAoEcFwEBAQEBAXyEAwEBAwFWIwULCzQSFBgNJIhLCdEEAQEBAQEFAQEBAR6RFAeESwWMC6kNhBofgnsBAQE X-IPAS-Result: AscIAGA2ZVSnWBqE/2dsb2JhbABbgw6KYssJAwQCAoEcFwEBAQEBAXyEAwEBAwFWIwULCzQSFBgNJIhLCdEEAQEBAQEFAQEBAR6RFAeESwWMC6kNhBofgnsBAQE X-IronPort-AV: E=Sophos;i="5.07,380,1413259200"; d="scan'208";a="97107542" Original-Received: from 167-88-26-132.cpe.teksavvy.com (HELO pastel.home) ([167.88.26.132]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 15 Nov 2014 22:58:21 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id A1F359865; Sat, 15 Nov 2014 22:58:21 -0500 (EST) In-Reply-To: (Christoph's message of "Sat, 15 Nov 2014 14:18:34 -0700") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 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:177277 Archived-At: > Just cherry-pick the change? No: the emacs-24 gets *merged* to master. Cherry-picking only happens when we go the other way (i.e. when we need to port a patch from master to emacs-24). Stefan