[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:
> 
> Aaron Bentley wrote:
> Is the external diff tool used to create patches?

By default, we use our internal diff implementation.  But when "--using
diff" is supplied, or when --diff-options is supplied, we use an
external diff tool.

> I was under the
> impression that "bzr send" did that (or "bzr diff -p1"

Not sure what you mean, but "bzr send" always uses the internal diff
implementation, and "bzr diff" uses it by default.

> and that "bzr
> diff --using" was for producing human friendly display for reviews.

Well, it's for producing alternate outputs.  That may include colordiff
or diff -pwu, or anything, really.

> If /dev/null is the 0-sized file, then how does one change the
> modification time of it?

I doubt that a normal user can change the modification time of
/dev/null, but the function would be os.utime.

> What is the "inverse" of this?

I was saying for deleted files, the "new" state is /dev/null, 0-length,
unix epoch.  The inverse is that for created files, the "old" state is
/dev/null, 0-length, unix epoch.

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

iD8DBQFIz6uP0F+nu1YWqI0RAjO5AJwIxU6C/E7uYnaj9DzhtNwfkUIkuQCfT96g
AU8CxS/vlANJv3dOtLrW6fY=
=eLb6
-----END PGP SIGNATURE-----