unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Lennart Borgman <lennart.borgman@gmail.com>
Cc: Eli Zaretskii <eliz@gnu.org>, emacs-devel@gnu.org
Subject: Re: My bzr diff output for Emacs is now 6 MB
Date: Wed, 02 Feb 2011 11:08:48 -0500	[thread overview]
Message-ID: <jwvr5bqzair.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <AANLkTim5t+cVMjGhSunAUPXGCUCvyAn1AVR18LOdaQB9@mail.gmail.com> (Lennart Borgman's message of "Wed, 2 Feb 2011 13:27:59 +0100")

> I did not save this one, but I have an old output from bzr diff from
> 2010-12-29 which is 6 MB. The diff is done after the merge and against
> the checked out trunk.

You probably didn't do the diff you thought you were doing.  A common
case for is to do the diff before committing: Bzr stupidly ignores the
pending merges when computing the ancestry, so a "diff -rsubmit:"
applied after a merge but before the corresponding commit will show
misleading results.

> Unfortunately the bzr diff output does not contain any details about
> what revisions was diffed. (Is not that a big omitting?)

IIRC I filed a bug about that (or added to a pre-existing bug about
that) a few years ago.  Please look for that bug and add your voice
to it.


        Stefan



  parent reply	other threads:[~2011-02-02 16:08 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
2011-02-02 12:27       ` Lennart Borgman
2011-02-02 13:46         ` Eli Zaretskii
2011-02-02 16:08         ` Stefan Monnier [this message]
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=jwvr5bqzair.fsf-monnier+emacs@gnu.org \
    --to=monnier@iro.umontreal.ca \
    --cc=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).