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

[Aaron Bentley]

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

Robert Collins wrote:
> On Thu, 2007-07-19 at 08:40 -0400, Aaron Bentley wrote:
> On consideration I'd really rather see this controlled through a flag to
> the function or something.

I really feel that these are the correct parent values, at least for the
texts in question*.  I really feel that it's insane to commit after bzr
remerge has been hard-killed, since your tree files will be all wrong.

But here's a compromise that allows the merge to see the correct
parent-ids without changing the disk setting: a monkey-patch.

What do you think?

* cherry-pick support will eventually give us the appropriate
granularity for parent queries.  But, you know, it's not here yet.

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

iD8DBQFGn4kn0F+nu1YWqI0RAp5bAJ9rQ05AR2qoWuYyTTasWELIyb1hNwCfQeLt
qZvLNnBPzpzMYkPZV6tqC5k=
=DkSv
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: tree-plan-merge-2.patch
Type: text/x-patch
Size: 52399 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070719/d860319d/attachment-0001.bin