From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Reordering etc/NEWS Date: Wed, 09 May 2007 21:23:28 -0400 Message-ID: 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 1178760224 32419 80.91.229.12 (10 May 2007 01:23:44 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 10 May 2007 01:23:44 +0000 (UTC) Cc: Eli Zaretskii , rms@gnu.org, "Kim F. Storm" , emacs-devel@gnu.org To: Karl Fogel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 10 03:23:42 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 1HlxNb-0004cy-BM for ged-emacs-devel@m.gmane.org; Thu, 10 May 2007 03:23:39 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HlxUq-000485-F2 for ged-emacs-devel@m.gmane.org; Wed, 09 May 2007 21:31:08 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HlxUm-000480-F2 for emacs-devel@gnu.org; Wed, 09 May 2007 21:31:04 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HlxUk-00047o-2K for emacs-devel@gnu.org; Wed, 09 May 2007 21:31:03 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HlxUj-00047l-SX for emacs-devel@gnu.org; Wed, 09 May 2007 21:31:01 -0400 Original-Received: from tomts25.bellnexxia.net ([209.226.175.188] helo=tomts25-srv.bellnexxia.net) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1HlxNR-0002mH-HD; Wed, 09 May 2007 21:23:29 -0400 Original-Received: from ceviche.home ([70.55.144.218]) by tomts25-srv.bellnexxia.net (InterMail vM.5.01.06.13 201-253-122-130-113-20050324) with ESMTP id <20070510012328.SBG1521.tomts25-srv.bellnexxia.net@ceviche.home>; Wed, 9 May 2007 21:23:28 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 0B8EFB411C; Wed, 9 May 2007 21:23:28 -0400 (EDT) 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.1.50 (gnu/linux) X-detected-kernel: Solaris 8 (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:70728 Archived-At: > 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 > 2) Get some developers to agree to run the branch for a while, to > 3) One day, when the new work on the branch is done, merge it into This is exactly what we've been doing for the unicoe and the multitty branches. Stefan