From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jason Rumney Newsgroups: gmane.emacs.devel Subject: Re: Merging unicode Date: Tue, 29 May 2007 23:12:07 +0100 Message-ID: <465CA537.7010601@gnu.org> References: <857iqrxpkj.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: 7bit X-Trace: sea.gmane.org 1180476750 30291 80.91.229.12 (29 May 2007 22:12:30 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 29 May 2007 22:12:30 +0000 (UTC) Cc: Juanma Barranquero , Emacs-Devel , Andreas Schwab To: David Kastrup Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 30 00:12:29 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 1Ht9vY-0001JH-3q for ged-emacs-devel@m.gmane.org; Wed, 30 May 2007 00:12:28 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ht9vX-0007Ka-JV for ged-emacs-devel@m.gmane.org; Tue, 29 May 2007 18:12:27 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ht9vU-0007KS-IW for emacs-devel@gnu.org; Tue, 29 May 2007 18:12:24 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ht9vT-0007KD-58 for emacs-devel@gnu.org; Tue, 29 May 2007 18:12:24 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ht9vT-0007KA-1N for emacs-devel@gnu.org; Tue, 29 May 2007 18:12:23 -0400 Original-Received: from outmail1.freedom2surf.net ([194.106.33.237]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Ht9vR-0002yx-UJ; Tue, 29 May 2007 18:12:22 -0400 Original-Received: from [127.0.0.1] (i-83-67-23-108.freedom2surf.net [83.67.23.108]) by outmail1.freedom2surf.net (Postfix) with ESMTP id CBBCF504CA; Tue, 29 May 2007 23:12:12 +0100 (BST) User-Agent: Thunderbird 2.0.0.0 (Windows/20070326) In-Reply-To: <857iqrxpkj.fsf@lola.goethe.zz> 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:71968 Archived-At: David Kastrup wrote: > Merging unicode2 first will cause synch headaches in the multitty > branch (larger than the other way round, presumably). I don't know why you presume this. The same two versions will be being merged, and the same conflicts produced. The branch in CVS where the work takes place to resolve the conflicts is the only variable.