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

[Robert Collins]

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)


For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C475353A4.4060601%40utoronto.ca%3E