From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Karl Fogel Newsgroups: gmane.emacs.devel Subject: Re: Reordering etc/NEWS Date: Wed, 09 May 2007 15:59:32 -0700 Message-ID: <87bqgtiox7.fsf@red-bean.com> References: <2wmz0iriyj.fsf@fencepost.gnu.org> <87fy65k6eh.fsf@red-bean.com> <853b25lk43.fsf@lola.goethe.zz> <87sla5iqhs.fsf@red-bean.com> <85sla5k4py.fsf@lola.goethe.zz> Reply-To: Karl Fogel NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1178751593 11387 80.91.229.12 (9 May 2007 22:59:53 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 9 May 2007 22:59:53 +0000 (UTC) Cc: Eli Zaretskii , emacs-devel@gnu.org, rms@gnu.org, "Kim F. Storm" To: David Kastrup Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 10 00:59:52 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 1Hlv8M-0000HK-VD for ged-emacs-devel@m.gmane.org; Thu, 10 May 2007 00:59:47 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HlvFb-0003Rd-QQ for ged-emacs-devel@m.gmane.org; Wed, 09 May 2007 19:07:15 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HlvFW-0003IQ-LG for emacs-devel@gnu.org; Wed, 09 May 2007 19:07:10 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HlvFT-0003D0-7U for emacs-devel@gnu.org; Wed, 09 May 2007 19:07:10 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HlvFT-0003Ce-0R for emacs-devel@gnu.org; Wed, 09 May 2007 19:07:07 -0400 Original-Received: from sanpietro.red-bean.com ([66.146.193.61]) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Hlv8B-0006go-Ho; Wed, 09 May 2007 18:59:35 -0400 Original-Received: from localhost ([127.0.0.1]:46175 ident=kfogel) by sanpietro.red-bean.com with esmtp (Exim 4.63) (envelope-from ) id 1Hlv89-0000Pm-M9; Wed, 09 May 2007 17:59:33 -0500 In-Reply-To: <85sla5k4py.fsf@lola.goethe.zz> (David Kastrup's message of "Thu\, 10 May 2007 00\:32\:57 +0200") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.98 (gnu/linux) X-detected-kernel: Linux 2.6 (newer, 3) 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:70724 Archived-At: David Kastrup writes: > 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. The question of whether the two branches will cause conflicts when both merged into trunk does not need to be a mystery: we can try it and see what happens :-). I don't mean try it on trunk, I mean try it out in a sandbox -- either in a working copy of one of the branches, or in a third branch created just for this purpose. Of course, there could be unexpected interactions that don't manifest themselves as conflicts. But if the two branches and trunk are combined in a third branch that some people then run, such interactions can be uncovered before they go into trunk. Apologies if all this is clear to you already; I thought it might help to say it explicitly, for those who hadn't thought much about the problem yet. -Karl