[MERGE] get rid of os.spawnvp() usage for external diff

[James Henstridge]

This is a patch I did a while back to allow sending diff output to a
file when using an external diff rather than just stdout.

To do this, it changed external_diff() to use the subprocess module to
invoke diff rather than os.spawnvp().  Since os.spawnvp() is not
available on Windows (according to the Python documentation), this
should also improve cross platform compatibility.

The changes are available in following branch at revision 1698:
    http://people.ubuntu.com/~jamesh/bzr/bzr.smallfixes

The patch should fix bugs 4047 and 48914.

James.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-external-diff-to-file.patch
Type: text/x-patch
Size: 3457 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060608/8730e2f4/attachment.bin