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: Reordering etc/NEWS Date: Thu, 10 May 2007 00:32:57 +0200 Message-ID: <85sla5k4py.fsf@lola.goethe.zz> References: <2wmz0iriyj.fsf@fencepost.gnu.org> <87fy65k6eh.fsf@red-bean.com> <853b25lk43.fsf@lola.goethe.zz> <87sla5iqhs.fsf@red-bean.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1178749983 6985 80.91.229.12 (9 May 2007 22:33:03 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 9 May 2007 22:33:03 +0000 (UTC) Cc: Eli Zaretskii , emacs-devel@gnu.org, rms@gnu.org, "Kim F. Storm" To: Karl Fogel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 10 00:33:02 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 1HluiT-00045F-Kb for ged-emacs-devel@m.gmane.org; Thu, 10 May 2007 00:33:01 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Hlupi-0008CP-C7 for ged-emacs-devel@m.gmane.org; Wed, 09 May 2007 18:40:30 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Hlupe-0008CA-Qi for emacs-devel@gnu.org; Wed, 09 May 2007 18:40:26 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Hlupd-0008By-Ac for emacs-devel@gnu.org; Wed, 09 May 2007 18:40:26 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Hlupd-0008Bv-7p for emacs-devel@gnu.org; Wed, 09 May 2007 18:40:25 -0400 Original-Received: from mail-in-11.arcor-online.net ([151.189.21.51]) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1HluiL-0003m7-UN; Wed, 09 May 2007 18:32:54 -0400 Original-Received: from mail-in-01-z2.arcor-online.net (mail-in-01-z2.arcor-online.net [151.189.8.13]) by mail-in-11.arcor-online.net (Postfix) with ESMTP id 61623114B1; Thu, 10 May 2007 00:32:52 +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 520FE7BEBD; Thu, 10 May 2007 00:32:52 +0200 (CEST) Original-Received: from lola.goethe.zz (dslb-084-061-049-011.pools.arcor-ip.net [84.61.49.11]) by mail-in-02.arcor-online.net (Postfix) with ESMTP id 2F0E32DA5AE; Thu, 10 May 2007 00:32:52 +0200 (CEST) Original-Received: by lola.goethe.zz (Postfix, from userid 1002) id 035961C27956; Thu, 10 May 2007 00:32:57 +0200 (CEST) In-Reply-To: <87sla5iqhs.fsf@red-bean.com> (Karl Fogel's message of "Wed\, 09 May 2007 15\:25\:35 -0700") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.98 (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:70720 Archived-At: Karl Fogel writes: > David Kastrup writes: > >> Richard has just announced that he plans on releasing Emacs 22.1 >> from the EMACS_BASE_22 branch. It is not clear to me what should >> right now happen on the trunk, though: should the branch merges of >> multitty and emacs-unicode-2 commence now, or later? > > I think merges of complex development branches can be handled > incrementally by using bidirectional merging: > > 1) Repeatedly merge trunk into the branch, so the branch isn't > generally much out-of-date (w.r.t. recent trunk changes). > > 2) Get some developers to agree to run the branch for a while, to > test for obvious showstoppers. > > 3) One day, when the new work on the branch is done, merge it into > trunk. It'll already contain everything trunk contains, so the > only new material will be the branch work, and that will be > well-tested. > > IOW, trunk always gets new changes, except when they might > destabilize trunk to the point of unusability, in which case a > branch is used temporarily to stabilize them -- after which they go > to trunk. > > So regarding your original question: what state of testedness are > the multitty and emacs-unicode-2 branches in, and how far out of > date w.r.t. trunk are they? They are basically synched to within a few weeks at most, and have been used in production use partly for years and kept synched over all that time. That is the situation as I understand it. The main concern is that we have _two_ branches to merge, so there might be conflicts. According to the maintainers of the branches, those should be rather confined. If one wanted to push one's luck, one could say that a first Emacs 23.1 prerelease should be possible a month after the serious work on the branch merges commences. Those branches have been slated for Emacs 23.1 _exactly_ because they are in good state. Other branches, like Emacs-bidi, don't appear viable for a fast release. -- David Kastrup, Kriemhildstr. 15, 44793 Bochum