From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: My bzr diff output for Emacs is now 6 MB
Date: Wed, 02 Feb 2011 06:03:13 +0200
Message-ID: <83fws7ccce.fsf@gnu.org>
References: <AANLkTimoZR_UeP6zepHTZ2Dx6_rANqVYKwJ17Y2oSGSn@mail.gmail.com>
Reply-To: Eli Zaretskii <eliz@gnu.org>
NNTP-Posting-Host: lo.gmane.org
X-Trace: dough.gmane.org 1296619405 20426 80.91.229.12 (2 Feb 2011 04:03:25 GMT)
X-Complaints-To: usenet@dough.gmane.org
NNTP-Posting-Date: Wed, 2 Feb 2011 04:03:25 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: Lennart Borgman <lennart.borgman@gmail.com>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Feb 02 05:03:21 2011
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
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.69)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1PkTw8-0005NS-TG
	for ged-emacs-devel@m.gmane.org; Wed, 02 Feb 2011 05:03:21 +0100
Original-Received: from localhost ([127.0.0.1]:49315 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1PkTw5-0003r5-OO
	for ged-emacs-devel@m.gmane.org; Tue, 01 Feb 2011 23:03:17 -0500
Original-Received: from [140.186.70.92] (port=58443 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PkTw1-0003qw-NR
	for emacs-devel@gnu.org; Tue, 01 Feb 2011 23:03:14 -0500
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1PkTw0-00076O-Ol
	for emacs-devel@gnu.org; Tue, 01 Feb 2011 23:03:13 -0500
Original-Received: from mtaout21.012.net.il ([80.179.55.169]:49631)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@gnu.org>)
	id 1PkTw0-00076K-EQ
	for emacs-devel@gnu.org; Tue, 01 Feb 2011 23:03:12 -0500
Original-Received: from conversion-daemon.a-mtaout21.012.net.il by
	a-mtaout21.012.net.il (HyperSendmail v2007.08) id
	<0LFZ000001T0AI00@a-mtaout21.012.net.il> for
	emacs-devel@gnu.org; Wed, 02 Feb 2011 06:03:10 +0200 (IST)
Original-Received: from HOME-C4E4A596F7 ([77.124.97.124]) by a-mtaout21.012.net.il
	(HyperSendmail v2007.08) with ESMTPA id
	<0LFZ000441X93G50@a-mtaout21.012.net.il>;
	Wed, 02 Feb 2011 06:03:10 +0200 (IST)
In-reply-to: <AANLkTimoZR_UeP6zepHTZ2Dx6_rANqVYKwJ17Y2oSGSn@mail.gmail.com>
X-012-Sender: halo1@inter.net.il
X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta)
X-Received-From: 80.179.55.169
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=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:135447
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/135447>

> From: Lennart Borgman <lennart.borgman@gmail.com>
> Date: Wed, 2 Feb 2011 04:40:32 +0100
> 
> It looks like bzr failed to merge date changes etc.

What do you mean by "merging date changes"?