From mboxrd@z Thu Jan  1 00:00:00 1970
Path: main.gmane.org!not-for-mail
From: Jason Rumney <jasonr@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: Major update just committed
Date: 01 Jun 2003 21:11:14 +0100
Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org
Message-ID: <uznl1y2vx.fsf@jasonrumney.net>
References: <20030530092229.81D3.JMBARRANQUERO@laley.wke.es>
	<E19MCOi-0007Yc-PQ@fencepost.gnu.org>
	<20030601171525.AB49.LEKTU@terra.es>
NNTP-Posting-Host: main.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Trace: main.gmane.org 1054498317 21073 80.91.224.249 (1 Jun 2003 20:11:57 GMT)
X-Complaints-To: usenet@main.gmane.org
NNTP-Posting-Date: Sun, 1 Jun 2003 20:11:57 +0000 (UTC)
Cc: emacs-devel@gnu.org
Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Sun Jun 01 22:11:55 2003
Return-path: <emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org>
Original-Received: from quimby.gnus.org ([80.91.224.244])
	by main.gmane.org with esmtp (Exim 3.35 #1 (Debian))
	id 19MZBL-0005Ta-00
	for <emacs-devel@main.gmane.org>; Sun, 01 Jun 2003 22:11:55 +0200
Original-Received: from monty-python.gnu.org ([199.232.76.173])
	by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian))
	id 19MZRc-0006Gv-00
	for <emacs-devel@quimby.gnus.org>; Sun, 01 Jun 2003 22:28:44 +0200
Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.20)
	id 19MZCk-0003eI-Js
	for emacs-devel@quimby.gnus.org; Sun, 01 Jun 2003 16:13:22 -0400
Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20)
	id 19MZC2-0003Hp-TZ
	for emacs-devel@gnu.org; Sun, 01 Jun 2003 16:12:38 -0400
Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20)
	id 19MZBA-0002jj-Rc
	for emacs-devel@gnu.org; Sun, 01 Jun 2003 16:11:45 -0400
Original-Received: from server0011.freedom2surf.net ([194.106.56.14]
	helo=server0027.freedom2surf.net)
	by monty-python.gnu.org with esmtp (Exim 4.20)	id 19MZB3-0002PR-0K
	for emacs-devel@gnu.org; Sun, 01 Jun 2003 16:11:37 -0400
Original-Received: from wanchan.jasonr.f2s.com ([195.137.103.251])
	h51KBZCb020122;	Sun, 1 Jun 2003 20:11:36 GMT
Original-Received: from NYAUMO (nyaumo.jasonr.f2s.com [10.0.0.27])
	by wanchan.jasonr.f2s.com (Postfix) with ESMTP
	id 669DADDF15; Sun,  1 Jun 2003 21:11:35 +0100 (BST)
Original-To: Juanma Barranquero <lektu@terra.es>
In-Reply-To: <20030601171525.AB49.LEKTU@terra.es>
Original-Lines: 10
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1b5
Precedence: list
List-Id: Emacs development discussions. <emacs-devel.gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Post: <mailto:emacs-devel@gnu.org>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
List-Archive: <http://mail.gnu.org/pipermail/emacs-devel>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org
Xref: main.gmane.org gmane.emacs.devel:14572
X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:14572

Juanma Barranquero <lektu@terra.es> writes:

> In the first case, the gap between the emacs-unicode branch and the
> trunk will widen still more; the joining back it's going to be painful,
> I think.

Changes from HEAD should be merged into unicode at frequent intervals
(for some definition of frequent that does not usually produce a large
number of conflicts).