From: Eli Zaretskii <eliz@gnu.org>
To: Lennart Borgman <lennart.borgman@gmail.com>
Cc: emacs-devel@gnu.org
Subject: Re: My bzr diff output for Emacs is now 6 MB
Date: Wed, 02 Feb 2011 07:06:36 -0500 [thread overview]
Message-ID: <E1PkbTo-0004rL-Fk@fencepost.gnu.org> (raw)
In-Reply-To: <AANLkTinUipbeQiDewC_GPC8bgKi424mCwpu23dEQqC2i@mail.gmail.com> (message from Lennart Borgman on Wed, 2 Feb 2011 05:07:12 +0100)
> 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".
next prev parent reply other threads:[~2011-02-02 12:06 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-02 3:40 My bzr diff output for Emacs is now 6 MB Lennart Borgman
2011-02-02 4:03 ` Eli Zaretskii
2011-02-02 4:07 ` Lennart Borgman
2011-02-02 12:06 ` Eli Zaretskii [this message]
2011-02-02 12:27 ` Lennart Borgman
2011-02-02 13:46 ` Eli Zaretskii
2011-02-02 16:08 ` Stefan Monnier
2011-02-03 18:28 ` Lennart Borgman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1PkbTo-0004rL-Fk@fencepost.gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=lennart.borgman@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).