[MERGE] Merge with bzr.dev

[Aaron Bentley]

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

Hi all,

This patch adds PreviewTree to the intertree tests, and fixes several
bugs revealed by doing so.  It deletes test_wrong_tree_value_error,
because that behaviour is no longer expected.  Calling iter_changes with
any tree other than the transform basis tree is now expected to succeed,
and that circumstance now tested through the intertree tests.

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

iD8DBQFI1+h+0F+nu1YWqI0RApZaAJ40I7fEwc/q+bZqEMqdjsJK3cGK9ACfZjy8
p69UhwwNLOOUlg0ynP9aaUc=
=m+A7
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: intertree-3422.patch
Type: text/x-diff
Size: 53550 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080922/b6174ef1/attachment-0001.bin