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: Post-22.1 development? Date: Sun, 03 Jun 2007 23:31:23 -0400 Message-ID: <878xb05ras.fsf@stupidchicken.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1180927894 4083 80.91.229.12 (4 Jun 2007 03:31:34 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 4 Jun 2007 03:31:34 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jun 04 05:31:33 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 1Hv3I4-00058h-Uo for ged-emacs-devel@m.gmane.org; Mon, 04 Jun 2007 05:31:33 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Hv3I4-0006Y4-Do for ged-emacs-devel@m.gmane.org; Sun, 03 Jun 2007 23:31:32 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Hv3I1-0006Xx-8A for emacs-devel@gnu.org; Sun, 03 Jun 2007 23:31:29 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Hv3Hz-0006Xp-UO for emacs-devel@gnu.org; Sun, 03 Jun 2007 23:31:27 -0400 Original-Received: from south-station-annex.mit.edu ([18.72.1.2]) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Hv3Hz-0007pN-KK for emacs-devel@gnu.org; Sun, 03 Jun 2007 23:31:27 -0400 Original-Received: from grand-central-station.mit.edu (GRAND-CENTRAL-STATION.MIT.EDU [18.7.21.82]) by south-station-annex.mit.edu (8.13.6/8.9.2) with ESMTP id l543VQfl024875 for ; Sun, 3 Jun 2007 23:31:26 -0400 (EDT) Original-Received: from outgoing-legacy.mit.edu (OUTGOING-LEGACY.MIT.EDU [18.7.22.104]) by grand-central-station.mit.edu (8.13.6/8.9.2) with ESMTP id l543VOuB008257 for ; Sun, 3 Jun 2007 23:31:24 -0400 (EDT) Original-Received: from localhost (SYDNEYPACIFIC-ONE-O-EIGHT.MIT.EDU [18.95.5.108]) ) by outgoing-legacy.mit.edu (8.13.6/8.12.4) with ESMTP id l543VN9g012735 for ; Sun, 3 Jun 2007 23:31:23 -0400 (EDT) Original-Received: from cyd by localhost with local (Exim 3.36 #1 (Debian)) id 1Hv3Hv-0002PL-00 for ; Sun, 03 Jun 2007 23:31:23 -0400 X-Scanned-By: MIMEDefang 2.42 X-Spam-Score: 2 X-detected-kernel: Solaris 9.1 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:72183 Archived-At: Now Emacs 22.1 is released (for those who don't read info-gnu-emacs, see http://permalink.gmane.org/gmane.emacs.announce/11 ), what is the development plan for the trunk and the branch? My understanding is that the EMACS_22_BASE branch will be used to make future 22.x releases. Should I bump the version on this branch to 22.1.50? Should we begin merging the fixes that have been checked into the trunk over last couple of months into the trunk, and if so, What is the criterion for choosing patches to merge? In a recent email, Stefan suggested that we should not restrict 22.x development to bugfixes, but also include new features if the new features are not too invasive. Do people agree with this approach? If so, I think a reasonable procedure we can follow is to (i) go ahead and start merging *bugfixes* from the trunk into the branch, and (ii) make a request to emacs-devel for each new *feature* from the trunk that we want to add to the branch. As for the trunk, should we begin merging the unicode branch in? I don't think this would interfere much with the process of merging the trunk patches into the EMACS_22_BASE branch, since that's just a matter of looking up ChangeLog entries and browing CVS diffs. Also, is it "open season" on checkins to the trunk, or do we want to complete the unicode merge first?