[MERGE] Implement Tree.plan_merge, deprecate RevisionTree.get_weave

[Aaron Bentley]

Hi Robert,

Please don't CC my panoramicfeedback.com address.  The utoronto one is
what I use for Bazaar stuff.

Aaron Bentley
Director of Technology
Panometrics, Inc.