From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel,gmane.emacs.multi-tty Subject: Merging multitty (was: Reordering etc/NEWS) Date: Fri, 11 May 2007 10:44:58 +0200 Message-ID: <86bqgr3g1h.fsf_-_@lola.quinscape.zz> References: <2wmz0iriyj.fsf@fencepost.gnu.org> <87fy65k6eh.fsf@red-bean.com> <853b25lk43.fsf@lola.goethe.zz> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: sea.gmane.org 1178873113 8854 80.91.229.12 (11 May 2007 08:45:13 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 11 May 2007 08:45:13 +0000 (UTC) Cc: karoly@lorentey.hu, rms@gnu.org, multi-tty@fnord.hu, emacs-devel@gnu.org To: Kenichi Handa Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri May 11 10:45:10 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 1HmQkP-0006Yi-QQ for ged-emacs-devel@m.gmane.org; Fri, 11 May 2007 10:45:10 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HmQro-0008Ms-0U for ged-emacs-devel@m.gmane.org; Fri, 11 May 2007 04:52:48 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HmQrh-0008M1-4P for emacs-devel@gnu.org; Fri, 11 May 2007 04:52:41 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HmQrg-0008Lg-7y for emacs-devel@gnu.org; Fri, 11 May 2007 04:52:40 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HmQrg-0008Ld-3U for emacs-devel@gnu.org; Fri, 11 May 2007 04:52:40 -0400 Original-Received: from pc3.berlin.powerweb.de ([62.67.228.11]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1HmQkG-0002vL-FA for emacs-devel@gnu.org; Fri, 11 May 2007 04:45:00 -0400 Original-Received: from quinscape.de (pd95b0fdb.dip0.t-ipconnect.de [217.91.15.219]) by pc3.berlin.powerweb.de (8.9.3p3/8.9.3) with ESMTP id KAA31807 for ; Fri, 11 May 2007 10:44:57 +0200 X-Delivered-To: Original-Received: (qmail 438 invoked from network); 11 May 2007 08:44:58 -0000 Original-Received: from unknown (HELO lola.quinscape.zz) ([10.0.3.43]) (envelope-sender ) by ns.quinscape.de (qmail-ldap-1.03) with SMTP for ; 11 May 2007 08:44:58 -0000 Original-Received: by lola.quinscape.zz (Postfix, from userid 1001) id 4AA898F998; Fri, 11 May 2007 10:44:58 +0200 (CEST) In-Reply-To: (Kenichi Handa's message of "Fri\, 11 May 2007 17\:03\:38 +0900") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.91 (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:70791 gmane.emacs.multi-tty:674 Archived-At: Kenichi Handa writes: > In article , Richard Stallman writes: > >> So people can use the trunk for changes meant for Emacs 23. > > Does it mean that it is ok to merge emacs-unicode-2 into the > trunk now? Well, this is one of the points we definitely agreed to do for Emacs 23, so it _would_ appear to be in concord with Richard's statement here. However, I think we more or less agreed that it would be more prudent to merge the multitty stuff first and follow up with the Unicode branch, since that would minimize the merge work on multitty where we have less active expertise to rely on. Cc to K=E1roly and the multi-tty list. In either case, a merge into trunk is quite a bit of work, so it would certainly not do harm to ask Richard for the explicit goahead if we can agree on the procedures. The last updates of multitty appear to have happened on Apr 22nd. K=E1roly, would it be possible for you to synch one last time to the trunk and then check the results into a branch in Emacs CVS? I would propose the following procedure: a) K=E1roly synchronizes his version to the trunk [very desirable] [after this has happened, we may already have word from list participants and Richard whether we can agree on this procedure] b) if he has CVS write access, he checks the results into a branch emacs-multitty. If he hasn't, we need someone else to do this. c) The branch is merged into the trunk. If point a had already been done by K=E1roly, this will be trivial. If he has not been able to do this, more work will be involved, but I don't expect serious merge conflicts. d) problems are shaken out. This will particularly affect platforms not yet tested/implemented in multitty. While d) happens, emacs-unicode2 is synchronized according to what the developers of the branch feel appropriate. Synchronizing with the new trunk will mean that there will be no production-quality emacs-unicode2 until the trunk has stabilized again. e) once the worst appears to be over, emacs-unicode2 is merged. _Afterwards_, pent-up package updates reserved for "post-release" will get merged. This means that merge conflicts due to the multitty and unicode changes will have to be tackled by the people checking in the package updates. Comments, better ideas? --=20 David Kastrup