From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Juanma Barranquero" Newsgroups: gmane.emacs.devel Subject: Re: Merging unicode Date: Wed, 30 May 2007 00:54:06 +0200 Message-ID: References: <857iqrxpkj.fsf@lola.goethe.zz> <465CAD45.5070104@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1180479256 5641 80.91.229.12 (29 May 2007 22:54:16 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 29 May 2007 22:54:16 +0000 (UTC) Cc: Andreas Schwab , Emacs-Devel To: "Jason Rumney" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 30 00:54:14 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 1HtAZw-0001SW-8r for ged-emacs-devel@m.gmane.org; Wed, 30 May 2007 00:54:12 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HtAZv-0002R5-TM for ged-emacs-devel@m.gmane.org; Tue, 29 May 2007 18:54:11 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HtAZs-0002R0-1q for emacs-devel@gnu.org; Tue, 29 May 2007 18:54:08 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HtAZr-0002Qo-Ip for emacs-devel@gnu.org; Tue, 29 May 2007 18:54:07 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HtAZr-0002Ql-Cj for emacs-devel@gnu.org; Tue, 29 May 2007 18:54:07 -0400 Original-Received: from wx-out-0506.google.com ([66.249.82.224]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1HtAZq-0006wh-Tw for emacs-devel@gnu.org; Tue, 29 May 2007 18:54:07 -0400 Original-Received: by wx-out-0506.google.com with SMTP id h26so1708281wxd for ; Tue, 29 May 2007 15:54:06 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=JITUQCtH8uWKPNfTMcuzHydV3NkNbooFbV23Op+nEw3Pj1na8JsLoJAgPtCJ37hPQO9hi5QeW+D1mBcSEcHEPfziOsiLgtaQR2voON55mlfuTCfBYT+p+y/p4Ya9ySxI0BAR2swsF5x70BN5E/DJ2l+EWeMVLQ936HD8DU3bfic= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=ti9aKWcAbQJiS/nZ/nu5Es/inwVZkt4cPg5xUAMBAP4ymZ7tC+43usBEKNDlq3lmsKlyJTA5Vm3Vc96/AbVLkpSXLmbrtFEakKWQrD9wsoAqw7l4Tby7QRcGp4AuolvLih+SzOUpGN5dz2+0GVk+Gk4D7/jhRHAkYxWXZQ9mzRA= Original-Received: by 10.90.93.6 with SMTP id q6mr5597243agb.1180479246065; Tue, 29 May 2007 15:54:06 -0700 (PDT) Original-Received: by 10.90.103.8 with HTTP; Tue, 29 May 2007 15:54:06 -0700 (PDT) In-Reply-To: <465CAD45.5070104@gnu.org> Content-Disposition: inline X-detected-kernel: Linux 2.4-2.6 (Google crawlbot) 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:71972 Archived-At: On 5/30/07, Jason Rumney wrote: > I disagree that "who shoulders the effort" varies though. The merge > needs collaboration between people familiar with the code in both > branches to figure out how to best solve any problems that come up. That depends, I think, on whether branch A is merged to the trunk, and then B is merged immediately, or A is merged to the trunk, B synchronized one or more times with the trunk, and then merged some time afterwards. You talk about the problems, and I'm thinking more of the footwork of maintaining branches more or less synchronized, even if the number of conflicts is low. Whatever the case, I think we should merge the unicode branch ASAP. Juanma