[MERGE] merge and pull support merge directives

[Aaron Bentley]

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

Hi all,

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.

It introduces a new get_mergeable_from_url method that can return either
a MergeDirective or a BundleInfo object.

It prevents -r from being used with directives or bundles.  In theory,
we can reactivate that, but it's currently tricky to evaluate a revno
relative to a branch that we don't have a copy of.  I'm not sure there's
much demand for it, and Martin said it was confusing.

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

iD8DBQFF+uOI0F+nu1YWqI0RAnRCAJ0Saa2V9+qPm6vqHY0VxRJgTlIswQCeI3Bc
FfUeFETS6WDZGBUTAoMuheY=
=lrrm
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge-directive-manual2.patch
Type: text/x-patch
Size: 19715 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070316/530ddfcd/attachment.bin