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 07:06:36 -0500
Message-ID: <E1PkbTo-0004rL-Fk@fencepost.gnu.org>
References: <AANLkTimoZR_UeP6zepHTZ2Dx6_rANqVYKwJ17Y2oSGSn@mail.gmail.com>
	<83fws7ccce.fsf@gnu.org>
	<AANLkTinUipbeQiDewC_GPC8bgKi424mCwpu23dEQqC2i@mail.gmail.com>
Reply-To: Eli Zaretskii <eliz@gnu.org>
NNTP-Posting-Host: lo.gmane.org
X-Trace: dough.gmane.org 1296660093 18682 80.91.229.12 (2 Feb 2011 15:21:33 GMT)
X-Complaints-To: usenet@dough.gmane.org
NNTP-Posting-Date: Wed, 2 Feb 2011 15:21:33 +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 16:21:27 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 1PkeWI-0005Ml-4A
	for ged-emacs-devel@m.gmane.org; Wed, 02 Feb 2011 16:21:22 +0100
Original-Received: from localhost ([127.0.0.1]:38213 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1PkeWH-0003yh-4t
	for ged-emacs-devel@m.gmane.org; Wed, 02 Feb 2011 10:21:21 -0500
Original-Received: from [140.186.70.92] (port=54068 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Pkdiy-0003GS-Nc
	for emacs-devel@gnu.org; Wed, 02 Feb 2011 09:30:33 -0500
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1PkbTs-0007Bj-Th
	for emacs-devel@gnu.org; Wed, 02 Feb 2011 07:06:42 -0500
Original-Received: from fencepost.gnu.org ([140.186.70.10]:41570)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@gnu.org>)
	id 1PkbTs-0007Bf-ON
	for emacs-devel@gnu.org; Wed, 02 Feb 2011 07:06:40 -0500
Original-Received: from eliz by fencepost.gnu.org with local (Exim 4.69)
	(envelope-from <eliz@gnu.org>)
	id 1PkbTo-0004rL-Fk; Wed, 02 Feb 2011 07:06:36 -0500
In-reply-to: <AANLkTinUipbeQiDewC_GPC8bgKi424mCwpu23dEQqC2i@mail.gmail.com>
	(message from Lennart Borgman on Wed, 2 Feb 2011 05:07:12 +0100)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 140.186.70.10
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:135459
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/135459>

> From: Lennart Borgman <lennart.borgman@gmail.com>
> Date: Wed, 2 Feb 2011 05:07:12 +0100
> Cc: emacs-devel@gnu.org
> 
> On Wed, Feb 2, 2011 at 5:03 AM, Eli Zaretskii <eliz@gnu.org> wrote:
> >> 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"?
> 
> 
> The only difference I saw in several files where the date changes in
> the headers.

What do you mean by "headers"?

> However now - after a new checkout - things seems back to normal. It
> looks like bzr needs several turns sometimes to do the job.

That'd be news to me.  But it's hard to say anything intelligent
without seeing at least one instance of these "failed merges".