[MERGE] Merge directive format 2, Bundle format 4

[Aaron Bentley]

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

Vincent Ladeuil wrote:
> Not a complete review, just a few remarks.
> 
>>>>>> "aaron" == Aaron Bentley <aaron.bentley at utoronto.ca> writes:
> 
> <snip/>
> 
>     aaron> === added file 'doc/developers/bundle-format4.txt'
> 
> Great ! Can you add a pointer to this file as comments in the relevant files ?

Okay.

>     aaron> === modified file 'bzrlib/errors.py'
> 
> We are nearly consistent in errors.py in defining exceptions
> *without* a final 'Error' except for base classes to derive from.
> 
> Also, we are a bit less consistent in using a sentence explaining
> the error as a format without duplicating the error name itself.

Okay.  These are actually critiques of the container code, which is
going through a separate review, but I'll apply them there.

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

iD8DBQFGhmmR0F+nu1YWqI0RAjsyAJwOp/yvDM5evEkboYJg+zdq9VNEBQCfVYa/
n1OJE1Nip+SKESw64kHGhI0=
=8t/8
-----END PGP SIGNATURE-----