[MERGE] support set_parent_ids and plan_file_merge in PreviewTree

[Aaron Bentley]

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

Hi all,

This patch teaches PreviewTree to correctly do plan_file_merge.

The problem was that if a RevisionTree is used as the transform tree, it
should probably be listed as the parent.  But get_parent_ids always used
the transform tree's parents, so it would list the RevisionTree's
parents instead.

The solution was to change get_parent_ids so that it used values from
PreviewTree itself, rather than the transform tree.

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

iD8DBQFIhkh10F+nu1YWqI0RAlvVAKCGA3BfcTSPG6DgXDrzKLSucCFZ2wCcDgSv
XkP/qnoRETPOPZwkw+XNh1U=
=rurw
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: plan_merge-3410.patch
Type: text/x-diff
Size: 14913 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080722/0316592f/attachment.bin