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

[Aaron Bentley]

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

Jelmer Vernooij wrote:
> The attached patch simplifies the process that updates the file ids in a 
> working tree after dpush. It's based on the patch Aaron sent to the list 
> earlier.

bb:approve

I'm not sure whether it's possible that there are uncommitted local adds
or removes when update_workingtree_fileids is run.  If so, they will be
blown away by this operation.  (This can be fixed, of course.)

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.

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

iEYEARECAAYFAknl0kAACgkQ0F+nu1YWqI3GKgCeMS16svS516KkdihOTLK84WzY
RLkAn00J4UTBf202NZMmkuPA+MAQo5hA
=+RlT
-----END PGP SIGNATURE-----