Re: My bzr diff output for Emacs is now 6 MB

[Eli Zaretskii]

> From: Lennart Borgman <address@hidden>
> Date: Wed, 2 Feb 2011 05:07:12 +0100
> Cc: address@hidden
> 
> On Wed, Feb 2, 2011 at 5:03 AM, Eli Zaretskii <address@hidden> wrote:
> >> From: Lennart Borgman <address@hidden>
> >> 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".