[MERGE][PQM] Merge directive support

[Aaron Bentley]

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

Daniel Watkins wrote:
> On Wed, 9 Jul 2008 06:17:05 +0100
> Daniel Watkins <daniel at daniel-watkins.co.uk> wrote:
>> Attached is a patch which introduces support for merge directives into
>> PQM.  The majority of the work is Aaron's, I have merely polished it
>> up.  There are some slightly odd interactions with the VCS abstraction
>> layer (though they can all be worked-around), but they disappear with
>> the work I've been doing to remove the VCS abstraction.
> Resubmitting for BB.

The code for preparing the merge is no longer idiommatic-- it would be
more normal to use Merger.from_mergeable.  Though I note that this does
not verify the testament.

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

iD8DBQFIfifo0F+nu1YWqI0RAu1dAJwJtOMvEurSTGplJPZ2zE1IiXXdugCdFdhe
vpr5PI7DiAwJFjQQ0Hm2Vbk=
=BWBF
-----END PGP SIGNATURE-----