From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jason Rumney Newsgroups: gmane.emacs.devel Subject: Re: Using the trunk Date: Thu, 10 May 2007 14:14:33 +0100 Message-ID: <46431AB9.7010602@gnu.org> References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1178803023 29384 80.91.229.12 (10 May 2007 13:17:03 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 10 May 2007 13:17:03 +0000 (UTC) Cc: emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 10 15:17:01 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1Hm8Vp-00012E-Sl for ged-emacs-devel@m.gmane.org; Thu, 10 May 2007 15:16:54 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Hm8d8-0003Yg-Si for ged-emacs-devel@m.gmane.org; Thu, 10 May 2007 09:24:26 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Hm8cT-0001z1-2H for emacs-devel@gnu.org; Thu, 10 May 2007 09:23:45 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Hm8cR-0001uR-CD for emacs-devel@gnu.org; Thu, 10 May 2007 09:23:44 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Hm8cQ-0001tt-UX for emacs-devel@gnu.org; Thu, 10 May 2007 09:23:43 -0400 Original-Received: from outmail1.freedom2surf.net ([194.106.33.237]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Hm8V5-0004Kr-CO; Thu, 10 May 2007 09:16:08 -0400 Original-Received: from [127.0.0.1] (i-83-67-23-108.freedom2surf.net [83.67.23.108]) by outmail1.freedom2surf.net (Postfix) with ESMTP id E32D456F91; Thu, 10 May 2007 14:14:41 +0100 (BST) User-Agent: Thunderbird 2.0.0.0 (Windows/20070326) In-Reply-To: X-detected-kernel: Linux 2.4-2.6 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:70760 Archived-At: Richard Stallman wrote: > I decided to drop the plan to make 22.1 from the trunk, > and make it from EMACS_22_BASE. The change I put in the trunk only > is not important to put in EMACS_22_BASE. You do mean 22.2 here right? Otherwise, this is a plan which I wasn't aware of, and I'm sure many others weren't either. I do recall an idea to rebranch for 22.1 because of tag naming issues, but I think that died out after too much time passed without it being acted on, but since the branch was made, it was always the intention to release 22.1 from a branch AFAIK. If there are bugfixes in the trunk that need to go into 22.2, then we need to either apply those to EMACS_22_BASE immediately after we release 22.1, or branch the branch and check them in now, so they can be merged after release. The first option is easier as long as we get on and release quickly (now that the legal problems are out of the way).