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

[Lennart Borgman]

On Wed, Feb 2, 2011 at 5:08 PM, Stefan Monnier <address@hidden> wrote:
>> 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.

Hm, I thought so, but I am using this for merging and the diff is done later:

  @setlocal
  @set DEVHOME=bld

  @pushd %DEVHOME%\emacs\trunk
  bzr update
  @popd

  @pushd %DEVHOME%\emacs\emacsw32
  bzr merge
  bzr commit -m "Merge from trunk"
  @popd


>> 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.

I will if you tell me how to find it.