[MERGE][1.0] New annotate merge that performs well on packs

[Aaron Bentley]

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

Robert Collins wrote:
> Robert Collins has voted approve.
> Status is now: Approved
> Comment:
> on vf.plan_merge, it seems to me that if that gets reimplemented on
> PlanMerge, then PlanMerge might as well stay as a private interface, by
> doing
> +        vf = versionedfile._PlanMergeVersionedFile(file_id)
> +        last_revision_a = self._get_file_revision(file_id, vf, 'this:')
> +        last_revision_b = other._get_file_revision(file_id, vf, 'other:')
> +        plan = vf.plan_merge(last_revision_a, last_revision_b)

Okay, this version makes PlanMerge a private implementation detail of
_PlanMergeVersionedFile.

> I'm hoping to get your graph.Graph set difference request done today.

Thanks.  Until then, I've taken John's hint to disable topological sorting.

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

iD8DBQFHVJCe0F+nu1YWqI0RAs4WAKCHco06LQDMknM6cbAwee5d91ENNACePEVk
Sg1vwnOyAkUfcMTIXpidZOA=
=vs5H
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: fast-plan-merge-3.patch
Type: text/x-diff
Size: 35181 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071203/2ba417ba/attachment-0001.bin