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: Git transition checklist Date: Wed, 08 Jan 2014 16:07:46 -0500 Message-ID: References: <20140108135200.8ECF9380834@snark.thyrsus.com> <83sisydwmy.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1389215319 10334 80.91.229.3 (8 Jan 2014 21:08:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 8 Jan 2014 21:08:39 +0000 (UTC) Cc: "Eric S. Raymond" , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 08 22:08: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 1W10Mi-0006l6-T0 for ged-emacs-devel@m.gmane.org; Wed, 08 Jan 2014 22:08:41 +0100 Original-Received: from localhost ([::1]:48940 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W10Mi-0005m7-CI for ged-emacs-devel@m.gmane.org; Wed, 08 Jan 2014 16:08:40 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39956) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W10MW-0005lm-Jx for emacs-devel@gnu.org; Wed, 08 Jan 2014 16:08:36 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W10MO-0007Lj-HS for emacs-devel@gnu.org; Wed, 08 Jan 2014 16:08:28 -0500 Original-Received: from mercure.iro.umontreal.ca ([132.204.24.67]:37452) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W10MG-0007LA-1K; Wed, 08 Jan 2014 16:08:12 -0500 Original-Received: from hidalgo.iro.umontreal.ca (hidalgo.iro.umontreal.ca [132.204.27.50]) by mercure.iro.umontreal.ca (Postfix) with ESMTP id 9A36484457; Wed, 8 Jan 2014 16:08:11 -0500 (EST) Original-Received: from lechon.iro.umontreal.ca (lechon.iro.umontreal.ca [132.204.27.242]) by hidalgo.iro.umontreal.ca (Postfix) with ESMTP id 032EB1E5B8B; Wed, 8 Jan 2014 16:07:47 -0500 (EST) Original-Received: by lechon.iro.umontreal.ca (Postfix, from userid 20848) id D16D3B40D3; Wed, 8 Jan 2014 16:07:46 -0500 (EST) In-Reply-To: <83sisydwmy.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 08 Jan 2014 22:52:21 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-DIRO-MailScanner-Information: Please contact the ISP for more information X-DIRO-MailScanner: Found to be clean X-DIRO-MailScanner-SpamCheck: n'est pas un polluriel, SpamAssassin (score=-2.82, requis 5, autolearn=not spam, ALL_TRUSTED -2.82, MC_TSTLAST 0.00) X-DIRO-MailScanner-From: monnier@iro.umontreal.ca X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 132.204.24.67 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:167811 Archived-At: > . I think we should discuss some more how to work with the > development trunk and the release branch in parallel, and reflect > the results of the discussion in the Wiki. Right, there's also the bzrmerge.el thingy that needs to be ported to Git. > So perhaps we should find a way of having two separate branches, > such that switching between them does not require a build if > nothing changed. Currently, you'll be better off not using "colocated branches" but two separate Git trees. To the extent that most .el files will change between the two branches, a "git checkout" will be followed by a the equivalent of a full bootstrap (and will probably always require "make bootstrap" when switching from the release branch to the trunk). Stefan