From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Christoph Newsgroups: gmane.emacs.devel Subject: Merging changes from emacs-24 to master Date: Sat, 15 Nov 2014 14:18:34 -0700 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a11c3654ebef6080507ec494a X-Trace: ger.gmane.org 1416086330 27387 80.91.229.3 (15 Nov 2014 21:18:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 21:18:50 +0000 (UTC) To: Emacs development discussions Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 22:18:44 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 1Xpkjz-0005UP-GG for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 22:18:43 +0100 Original-Received: from localhost ([::1]:42062 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpkjy-0003ca-Ve for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 16:18:42 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpkju-0003Y7-87 for emacs-devel@gnu.org; Sat, 15 Nov 2014 16:18:39 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xpkjt-0006Hu-A8 for emacs-devel@gnu.org; Sat, 15 Nov 2014 16:18:38 -0500 Original-Received: from mail-la0-x235.google.com ([2a00:1450:4010:c03::235]:35360) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpkjs-0006HK-VI for emacs-devel@gnu.org; Sat, 15 Nov 2014 16:18:37 -0500 Original-Received: by mail-la0-f53.google.com with SMTP id mc6so16310602lab.40 for ; Sat, 15 Nov 2014 13:18:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=adFMOVJlhq5CYkXmWZmzSyIwc7d4YrAmhkATG+hDWn4=; b=DTZBo+NUk4D9IzEHZMItEvJfrd46Yyxl1ULwMyt8L1v+z3+R5jav6lDSOeMHfJt5xX BRDRQnN0UTy3RNhdcpr20uyMmR6TERM+VXru2lvwzqd8m63e3BsrpgfHvikur7qPQ09H T7kmPU1m6qtK2zrfI88wjwNeT9AyuWf23sWLb0TU5qhJ1f572Ofj+s2SlGdEUkgrGUKM RwhV9QuWicbGzZUpWuVUotjjR2RnY2iv14rilpI+PUbsMZkCVYUTxTGMfeZ0J0yAQgyM GiuqqGCn7BTcBJmFWBxOe0goW46k07/et6/1X+HGvY8mbjGu9FDBazJZprbTS+3xNk45 0PXQ== X-Received: by 10.152.116.102 with SMTP id jv6mr2172287lab.40.1416086314479; Sat, 15 Nov 2014 13:18:34 -0800 (PST) Original-Received: by 10.152.113.4 with HTTP; Sat, 15 Nov 2014 13:18:34 -0800 (PST) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::235 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:177254 Archived-At: --001a11c3654ebef6080507ec494a Content-Type: text/plain; charset=UTF-8 I just added rev b6cd03a to the emacs-24 branch (adding a file to .gitignore). The same issue needs to be fixed in master. What is the procedure to get the change from emacs-24 to master? Just cherry-pick the change? What about the Changelog? Is it expected to be merged in also? Or will there be a periodic bulk merge from emacs-24 to master? Sorry, if this has been discussed before, but there are just too many emails to keep up with. :) Thanks, Christoph --001a11c3654ebef6080507ec494a Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
I just added rev b6cd03a to the emacs-24 branch (adding a = file to .gitignore). The same issue needs to be fixed in master. What is th= e procedure to get the change from emacs-24 to master? Just cherry-pick the= change? What about the Changelog? Is it expected to be merged in also? Or = will there be a periodic bulk merge from emacs-24 to master?

=
Sorry, if this has been discussed before, but there are just too many = emails to keep up with. :)

Thanks,
Chris= toph
--001a11c3654ebef6080507ec494a--