[MERGE][BUG #235687] VF.make_mpdiffs failed to raise an exception

[John Arbash Meinel]

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

make_mpdiffs just wasn't accessing the right location for the exception.

This adds a test case for one location, I couldn't find a way to trigger the
second. Thanks to Daniel Fischer for fixing this. I just added a test case.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkg+wVYACgkQJdeBCYSNAANLNgCfTZQBTqJcp/dBrUBBhuxsLGlX
qmAAn08xwn8dAEtLDLrR04OoF7REAltR
=7Yur
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: mpdiffs_235687.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20080529/4caa2fef/attachment-0001.diff