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 changes from emacs-24 to master Date: Sun, 16 Nov 2014 05:38:44 +0200 Message-ID: <83mw7rerwb.fsf@gnu.org> References: Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416109166 19324 80.91.229.3 (16 Nov 2014 03:39:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 16 Nov 2014 03:39:26 +0000 (UTC) Cc: emacs-devel@gnu.org To: Christoph Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 16 04:39:19 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 1XpqgG-0003ar-NT for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 04:39:16 +0100 Original-Received: from localhost ([::1]:42671 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpqgG-0002pL-D4 for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 22:39:16 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpqg6-0002pE-Vu for emacs-devel@gnu.org; Sat, 15 Nov 2014 22:39:14 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xpqfz-00040Y-Go for emacs-devel@gnu.org; Sat, 15 Nov 2014 22:39:06 -0500 Original-Received: from mtaout25.012.net.il ([80.179.55.181]:55385) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpqfz-00040K-8Y for emacs-devel@gnu.org; Sat, 15 Nov 2014 22:38:59 -0500 Original-Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NF4001003IODC00@mtaout25.012.net.il> for emacs-devel@gnu.org; Sun, 16 Nov 2014 05:34:35 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF4000Y84LNAR30@mtaout25.012.net.il>; Sun, 16 Nov 2014 05:34:35 +0200 (IST) In-reply-to: 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.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:177269 Archived-At: > Date: Sat, 15 Nov 2014 14:18:34 -0700 > From: Christoph > > 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? There's no procedure yet. When there will be, it will be based on merges, like with bzr.