[MERGE] pull and merge commands can use merge directives

[Aaron Bentley]

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

Aaron Bentley wrote:
> Martin Pool wrote:

>> I am a bit concerned by read_bundle_or_directive- couldn't we just
>> somehow return a single type of object that does either thing?
> 
> Well, we can't return BundleReader, because the merge directive may not
> contain a bundle.  We can't return a MergeDirective, because the
> testament_sha1 for a v0.8 bundle is not right.  Also, in the current
> implementation, it would mean throwing out the reader.

All of which is to say that doing it right will take a bit longer, so
I've extracted the bugfixes and made a new merge request, so those at
least get into 0.15.

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

iD8DBQFF+A3s0F+nu1YWqI0RAkdZAJ4oqAtuVJknUbYWbtIoQ06/N7AodgCbBtO+
XMY82BXf0ktRDS9OSfuD7UU=
=s5aQ
-----END PGP SIGNATURE-----