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 18:43:07 -0700 Message-ID: <87irb1fo7o.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> 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 1178761400 2521 80.91.229.12 (10 May 2007 01:43:20 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 10 May 2007 01:43:20 +0000 (UTC) Cc: Eli Zaretskii , rms@gnu.org, "Kim F. Storm" , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 10 03:43:18 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 1Hlxgc-0007Lk-73 for ged-emacs-devel@m.gmane.org; Thu, 10 May 2007 03:43:18 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Hlxnr-00055G-N4 for ged-emacs-devel@m.gmane.org; Wed, 09 May 2007 21:50:47 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Hlxnn-0004zM-KA for emacs-devel@gnu.org; Wed, 09 May 2007 21:50:43 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Hlxnn-0004yh-2g for emacs-devel@gnu.org; Wed, 09 May 2007 21:50:43 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Hlxnm-0004yD-Se for emacs-devel@gnu.org; Wed, 09 May 2007 21:50:42 -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 1HlxgU-0004ol-LS; Wed, 09 May 2007 21:43:10 -0400 Original-Received: from localhost ([127.0.0.1]:43782 ident=kfogel) by sanpietro.red-bean.com with esmtp (Exim 4.63) (envelope-from ) id 1HlxgS-0003s3-Ov; Wed, 09 May 2007 20:43:08 -0500 In-Reply-To: (Stefan Monnier's message of "Wed\, 09 May 2007 21\:23\:28 -0400") 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:70729 Archived-At: Stefan Monnier writes: >> 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. That's great! Then we don't need to be afraid of merging them into trunk.