[merge] Enhancement to also use the external diff tool for new and deleted files.

[Aaron Bentley]

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

David Ingamells wrote:
> Extend bzr to also pass added and deleted files to the external diff
> tool when "bzr diff --using" is called.

Thanks for your submission.

diff --using shouldn't interfere with creating correct diffs, but this
change does.

A diff that deletes a file superficially resembles a diff that changes
the file's size to 0.  But there are differeces.  A deletion diff will
show /dev/null as the path to the 0-size file, and it will show the UNIX
epoch as the modified time of the 0-size file.  The inverse is true for
patches that create files.  These hints are used by patch to decide
whether to delete a file or change its contents.

As it stands, this change will cause incorrect patches to be generated
when doing diff --using diff.

bb:resubmit

> Feel free to be extra critical  ;-)   as this is my first submission to
> bzr *and* my first work with python.

Your mother was a hamster, and your father smelled of elderberries. ;-)

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

iD8DBQFIzyMH0F+nu1YWqI0RApTSAJ9hJTS+Jzbjaw/EY6NDV0cEUtBQ7QCdFs4F
ZxYITYKf5xc2BkApAe2RFvg=
=NUzN
-----END PGP SIGNATURE-----