From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Eric S. Raymond" Newsgroups: gmane.emacs.devel Subject: Re: git transition issues Date: Tue, 28 Oct 2014 14:07:39 -0400 Organization: Eric Conspiracy Secret Labs Message-ID: <20141028180738.GA13564@thyrsus.com> References: <20141027000718.F09B5382A66@snark.thyrsus.com> <20141027012827.GA10163@thyrsus.com> <20141028163655.GB10490@thyrsus.com> <8361f42hw9.fsf@gnu.org> Reply-To: esr@thyrsus.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1414519684 2928 80.91.229.3 (28 Oct 2014 18:08:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 28 Oct 2014 18:08:04 +0000 (UTC) Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Oct 28 19:07:59 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 1XjBBW-00021t-5q for ged-emacs-devel@m.gmane.org; Tue, 28 Oct 2014 19:07:58 +0100 Original-Received: from localhost ([::1]:40724 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XjBBU-0001j7-94 for ged-emacs-devel@m.gmane.org; Tue, 28 Oct 2014 14:07:56 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53907) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XjBBM-0001in-9m for emacs-devel@gnu.org; Tue, 28 Oct 2014 14:07:54 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XjBBI-00066K-1B for emacs-devel@gnu.org; Tue, 28 Oct 2014 14:07:48 -0400 Original-Received: from static-71-162-243-5.phlapa.fios.verizon.net ([71.162.243.5]:52175 helo=snark.thyrsus.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XjBBD-00065l-Cx; Tue, 28 Oct 2014 14:07:39 -0400 Original-Received: by snark.thyrsus.com (Postfix, from userid 1000) id 1C31B382D09; Tue, 28 Oct 2014 14:07:39 -0400 (EDT) Content-Disposition: inline In-Reply-To: <8361f42hw9.fsf@gnu.org> X-Eric-Conspiracy: There is no conspiracy User-Agent: Mutt/1.5.21 (2010-09-15) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 71.162.243.5 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:175935 Archived-At: 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 hope no one is entertaining the idea of having live bzr and git > repos in parallel, one for the release branch, the other for the > trunk. Right? Oh Goddess, no. -- Eric S. Raymond