From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: Syncing Gnus and Emacs repositories Date: Sat, 16 Jun 2007 16:16:52 +0200 Message-ID: <85wsy4m1bf.fsf@lola.goethe.zz> References: <6sps3z32ap.fsf@fencepost.gnu.org> <87tztbcue9.fsf@stupidchicken.com> <87lkemmrg4.fsf@stupidchicken.com> <18033.64249.816850.550250@kahikatea.snap.net.nz> <85ejkcq32v.fsf@lola.goethe.zz> <85k5u4nlrh.fsf@lola.goethe.zz> <85abv0nit7.fsf@lola.goethe.zz> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1182003450 28678 80.91.229.12 (16 Jun 2007 14:17:30 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sat, 16 Jun 2007 14:17:30 +0000 (UTC) Cc: Eli Zaretskii , emacs-devel@gnu.org To: YAMAMOTO Mitsuharu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jun 16 16:17:28 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 1HzZ5k-0008Dc-6A for ged-emacs-devel@m.gmane.org; Sat, 16 Jun 2007 16:17:28 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HzZ5j-00010k-KV for ged-emacs-devel@m.gmane.org; Sat, 16 Jun 2007 10:17:27 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HzZ5g-00010e-Ok for emacs-devel@gnu.org; Sat, 16 Jun 2007 10:17:24 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HzZ5f-00010S-AW for emacs-devel@gnu.org; Sat, 16 Jun 2007 10:17:23 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HzZ5f-00010P-4k for emacs-devel@gnu.org; Sat, 16 Jun 2007 10:17:23 -0400 Original-Received: from mail-in-10.arcor-online.net ([151.189.21.50]) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1HzZ5d-0000mX-Qw; Sat, 16 Jun 2007 10:17:22 -0400 Original-Received: from mail-in-01-z2.arcor-online.net (mail-in-11-z2.arcor-online.net [151.189.8.28]) by mail-in-10.arcor-online.net (Postfix) with ESMTP id 792101F574F; Sat, 16 Jun 2007 16:17:20 +0200 (CEST) Original-Received: from mail-in-02.arcor-online.net (mail-in-02.arcor-online.net [151.189.21.42]) by mail-in-01-z2.arcor-online.net (Postfix) with ESMTP id 617A8347118; Sat, 16 Jun 2007 16:17:20 +0200 (CEST) Original-Received: from lola.goethe.zz (dslb-084-061-025-018.pools.arcor-ip.net [84.61.25.18]) by mail-in-02.arcor-online.net (Postfix) with ESMTP id 3BD6D2DA7C3; Sat, 16 Jun 2007 16:17:20 +0200 (CEST) Original-Received: by lola.goethe.zz (Postfix, from userid 1002) id F0A2E1D0340C; Sat, 16 Jun 2007 16:16:52 +0200 (CEST) In-Reply-To: (YAMAMOTO Mitsuharu's message of "Sat\, 16 Jun 2007 22\:55\:01 +0900") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1.50 (gnu/linux) 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:73069 Archived-At: YAMAMOTO Mitsuharu writes: >>>>>> On Sat, 16 Jun 2007 15:13:40 +0200, David Kastrup said: > >> Frankly, I don't see the point in not merging either. I don't see >> that the trunk accomplishes _any_ function in connection to Emacs >> development that would not equally well be accomplished if unicode-2 >> was merged. We don't need a "stable" trunk: we have EMACS_BASE_22 >> for that purpose. > > I had an impression (yes, just an impression) that: > > EMACS_BASE_22: to become the next bugfix release 22.2. > Only bugfix changes should go there. Pretty much the point, though it is not clear whether some other stuff, like package updates will happen there, too. > trunk: to become EMACS_BASE_22 after the 22.2 release. That would make no sense. The point of the branch was to get a stable basis. > Changes common to 22 and 23 should go there. Frankly, I don't see that we can afford separate 22.x and 23.x development lines. > emacs-unicode-2: to become the trunk after the 22.2 release. > Changes specific to 23 (but not multi-tty-specific) should go > there. Changes made to the trunk also go there by regular > sync. by Miles. > > But as Richard said multi-tty changes could also go to the trunk > under a certain condition, this impression will never be true at > least in a strict sense. At the risk of repeating myself: active branches are expensive with regard to developer mindframe and feature availability (having the features of more than a single branch lets the merge efforts explode exponentially). We should clamp down on active branches whenever we can. If two active branches have no separate release goals, maintaining them separately is a cost in complexity and mindshare that we should not be affording without very good reason. EMACS_22_BASE is for 22.x, unicode-2 is clearly for 23.x, trunk has no clear release goal whatsoever. Branches and functionality like antialiasing, xft, bidi and others don't make much sense basing off or synching with a non-unicode-2 trunk. Neither does it make much sense to add new input encodings and similar stuff that is likely to interact with unicode-2 differently than with Emacs 22. -- David Kastrup, Kriemhildstr. 15, 44793 Bochum