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: Moving Emacs 24.3 development to emacs-24 branch soon Date: Thu, 01 Nov 2012 09:04:24 -0400 Message-ID: References: <87txtajclb.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1351775151 27586 80.91.229.3 (1 Nov 2012 13:05:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 1 Nov 2012 13:05:51 +0000 (UTC) Cc: Chong Yidong , Andreas Schwab , emacs-devel@gnu.org To: Dani Moncayo Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 01 14:05: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 1TTuT8-00033L-2X for ged-emacs-devel@m.gmane.org; Thu, 01 Nov 2012 14:05:58 +0100 Original-Received: from localhost ([::1]:52956 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTuSz-0005JO-Dk for ged-emacs-devel@m.gmane.org; Thu, 01 Nov 2012 09:05:49 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:46048) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTuRr-0003qj-HH for emacs-devel@gnu.org; Thu, 01 Nov 2012 09:04:44 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTuRl-0005uX-Je for emacs-devel@gnu.org; Thu, 01 Nov 2012 09:04:39 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:47844) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTuRd-0005s1-Ok; Thu, 01 Nov 2012 09:04:25 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av4EAG6Zu0/O+LET/2dsb2JhbABEtBGBCIIVAQEBAQIBAQJTIwULCw4mEhQUBA0kE4gJBQu5fpBEA5J2gzSNCYFYgwU X-IronPort-AV: E=Sophos;i="4.75,637,1330923600"; d="scan'208";a="203297932" Original-Received: from 206-248-177-19.dsl.teksavvy.com (HELO pastel.home) ([206.248.177.19]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 01 Nov 2012 09:04:24 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 7FAF758C9F; Thu, 1 Nov 2012 09:04:24 -0400 (EDT) In-Reply-To: (Dani Moncayo's message of "Thu, 1 Nov 2012 10:30:56 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.182 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:154610 Archived-At: >> You should create a branch instead. Your second step will lose the tag. I doubt we'll lose the tag because of a push. If anything, getting rid of a Bzr tag is incredibly difficult. >>> 2. In the `trunk' branch, >>> bzr push bzr+ssh://NAME@bzr.savannah.gnu.org/emacs/emacs-24 >>> This pushes the contents of `trunk' into `emacs-24'. > Also, Andreas' proposal of creating a new branch would avoid the > problem I pointed out here > http://lists.gnu.org/archive/html/emacs-devel/2012-08/msg00672.html The format of Emacs version numbers is used at various places, so we'd rather not change it. I.e. pretests will be "NN.MM.PP" and releases will be "NN.MM". But we could release the trunk as Emacs-25.1 instead of Emacs-24.3. OTOH, I do not intend to release a 24.3 that's not cut from the current trunk. It would have to be a truly super-extra incredibly urgent bug-fix to justify such measures. IOW I wouldn't even bother with the "emacs-24-base" tag, since if we really need to take such extreme measures, finding the "last revision on emacs-24 before the merge from trunk" would be a trivial part of the work ("bzr log, look for the merge message"). Stefan