From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chong Yidong Newsgroups: gmane.emacs.devel Subject: Re: Release branch plans Date: Tue, 03 Apr 2012 18:53:34 +0800 Message-ID: <87ehs5t7bl.fsf@gnu.org> References: <87d37q7ld4.fsf@gnu.org> <871uo6puac.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1333450440 13269 80.91.229.3 (3 Apr 2012 10:54:00 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 3 Apr 2012 10:54:00 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 03 12:53:58 2012 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 1SF1N4-0006mN-Hz for ged-emacs-devel@m.gmane.org; Tue, 03 Apr 2012 12:53:54 +0200 Original-Received: from localhost ([::1]:47021 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF1N4-0003G4-0H for ged-emacs-devel@m.gmane.org; Tue, 03 Apr 2012 06:53:54 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:33341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF1N0-0003Fv-W3 for emacs-devel@gnu.org; Tue, 03 Apr 2012 06:53:52 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SF1Mv-0005GB-EE for emacs-devel@gnu.org; Tue, 03 Apr 2012 06:53:50 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:40646) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF1Mv-0005G4-BZ for emacs-devel@gnu.org; Tue, 03 Apr 2012 06:53:45 -0400 Original-Received: from [155.69.16.223] (port=60096 helo=ulysses) by fencepost.gnu.org with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1SF1Ms-00062F-SL; Tue, 03 Apr 2012 06:53:43 -0400 In-Reply-To: (Stefan Monnier's message of "Mon, 02 Apr 2012 09:14:52 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.95 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 208.118.235.10 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:149321 Archived-At: Stefan Monnier writes: > We have `emacs-23' already, so the next one should simply be > `emacs-24' or `emacs-24.1'. Just to clarify (after a quick off-list discussion with Stefan): his first suggestion here refers to using `emacs-24' for the 24.1 release branch now, and when the time comes to open the trunk for Emacs 25 development (post 24.2), copying the contents of the trunk into the emacs-24 branch. That is to say, from now to 24.1 release, use emacs-24 for the release branch; after 24.1 release, 24.2 development takes place on trunk; shortly before 24.2 release, copy trunk into emacs-24 branch, and open trunk for Emacs 25 development. I guess this makes sense in a "make only as many Savannah branches as we need" way, but I don't know enough about usual bzr practices to know if it's TRT. Would the "copy everything over" step munge the history on the emacs-24 branch? Or is that not an issue?