[MERGE] merge and pull support merge directives

[Aaron Bentley]

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

Aaron Bentley wrote:
> Here's an updated patch to allow pull and merge to use merge directives.
>
> It adds a new get_target_revision method to both BundleInfo and
> MergeDirective.  This method ensures that the target revision is
> installed in the supplied repository, then returns the revision_id of
> that revision.

Ping?  Martin, since I made these changes in response to your comments,
I'd like to know whether this satisfies your concerns.

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

iD8DBQFGCRXb0F+nu1YWqI0RAkR+AJ9/f8dHjpxg74jSg4jIKiCivBZEJQCeJmVE
Zz4w1hSpKM8IthffnNwyJhQ=
=80jH
-----END PGP SIGNATURE-----