[merge] update to external diff fixes

[John Arbash Meinel]

Robert Collins wrote:
> On Tue, 2006-08-15 at 12:53 -0500, John Arbash Meinel wrote:
>> -from tempfile import TemporaryFile
>> +import subprocess
>> +from tempfile import TemporaryFile, mkdtemp 
> 
> +1 if you can explain what this is for :)
> 
> -Rob
> 

Subprocess is needed, because I spawn a real 'diff' and make sure that
our output matches.
mkdtemp was just a carry over. Because the original test_external_diff
wast part of a TestCase. I split out the function into a
TestCaseInTempDir so I could run 'diff' directly on files, and have it
cleaned up afterwards.

I'll clean it up before merging.

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060815/9e18c75d/attachment.pgp