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: git transition issues Date: Tue, 28 Oct 2014 20:19:39 +0200 Message-ID: <8338a82h1g.fsf@gnu.org> References: <20141027000718.F09B5382A66@snark.thyrsus.com> <20141027012827.GA10163@thyrsus.com> <20141028163655.GB10490@thyrsus.com> <8361f42hw9.fsf@gnu.org> <20141028180738.GA13564@thyrsus.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1414520419 15719 80.91.229.3 (28 Oct 2014 18:20:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 28 Oct 2014 18:20:19 +0000 (UTC) Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: esr@thyrsus.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Oct 28 19:20:12 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 1XjBNL-0002ke-Cs for ged-emacs-devel@m.gmane.org; Tue, 28 Oct 2014 19:20:11 +0100 Original-Received: from localhost ([::1]:40795 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XjBNK-0005wf-Uc for ged-emacs-devel@m.gmane.org; Tue, 28 Oct 2014 14:20:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56229) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XjBN2-0005r8-SB for emacs-devel@gnu.org; Tue, 28 Oct 2014 14:19:57 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XjBMx-0001Fl-Vu for emacs-devel@gnu.org; Tue, 28 Oct 2014 14:19:52 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:48609) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XjBMx-0001FU-Nr for emacs-devel@gnu.org; Tue, 28 Oct 2014 14:19:47 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NE6000002PCIU00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Tue, 28 Oct 2014 20:19:46 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NE600NA22WY2090@a-mtaout20.012.net.il>; Tue, 28 Oct 2014 20:19:46 +0200 (IST) In-reply-to: <20141028180738.GA13564@thyrsus.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 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:175937 Archived-At: > Date: Tue, 28 Oct 2014 14:07:39 -0400 > From: "Eric S. Raymond" > Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org > > Eli Zaretskii : > > Btw, all these changes are being committed to the trunk, but the > > release branch doesn't have them. However, if everything goes > > according to plan, Emacs 24.5 is supposed to be made from the release > > branch _after_ the transition to git. So I think at least most, if > > not all, of these changes need to be committed to the branch, and then > > merged to the trunk as usual. (For those changes that were already > > committed to the trunk, they should be cherry-picked to the branch.) > > If that is telling ne to do any further peparatory commits to the > 24.5 release branch, I will attempt to comply. I think so, but let's first hear from Stefan and Glenn; perhaps I'm missing something.