[MERGE] Bzr diff produces -p1 diffs

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Pool wrote:
> On  2 Mar 2006, Michael Ellerman <michael at ellerman.id.au> wrote:
> I see the prefix is now in bzr.dev -- in Aaron's merge yesterday of
> mpe's patch.  (I am not at all upset that the change went in, since when
> it was discussed it got two +1 votes -- I was offline travelling when it
> happened, but might not have responded in time anyhow.)  

Yes.  There was also my implied +0.  Fortunately, with the power of bzr,
we can just revert this.  We should also be able to merge . -r -1..-3,
but using the current branch as a merge source is broken atm.  (And
worse, so is the error message!)

> However, I am a bit unhappy with this change, since it changes the
> default behaviour of a fairly fundamental and long-standing command in a
> way that is likely to break many programs that build on bzr.

Yes, it certainly had an effect on bzrtools, for example.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFEBv9k0F+nu1YWqI0RAr2wAJ998JqFfk3NvhPLFaq9ztfhtFLNjgCfVv3j
55SBnZCzRQLXUeJHjCcxhJM=
=lmS2
-----END PGP SIGNATURE-----