[MERGE] Simplify working tree file id updates in dpush.

[Aaron Bentley]

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

Aaron Bentley wrote:
> It would also be nice to use set_parent_trees all the time, but when
> there's a pending merge, this would require retrieving the other parents
> via WT.revision_tree first.

Oh, also: If you set the last_revision first, you can get the tree from
WT.basis_tree(), and then iter_changes will be optimized (for
DirStateRevisionTree <-> DirStateTree) *and* you won't need to use
set_parent_trees for efficiency.

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

iEYEARECAAYFAknmBMsACgkQ0F+nu1YWqI3C9ACePIkw80i09gSwUxTokL1xRSRW
oQkAnj8KDW2jMZvDo43Ti78SltrBYBGw
=9uWK
-----END PGP SIGNATURE-----