[MERGE][0.15.0]

[John Arbash Meinel]

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

Aaron Bentley wrote:
> WorkingTree.extract was built for Inventory-based trees, but is now
> being used with dirstate-based trees.  As a result, it fails if the
> dirstate is dirty.
> 
> This patch fixes the bug by unconditionally flushing dirty state.  Not
> the most correct solution, but certainly a simple one.
> 
> Aaron

DirState.save() is actually a no-op if not modified, so flush() should
be fairly cheap.

The only real cost is if something is directly accessing tree.inventory,
since that needs to be regenerated after a flush. (I'm not sure why, but
that is the current code).

John
=:->

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

iD8DBQFF7zriJdeBCYSNAAMRAi+FAKCtfesXu8GFzJSU1zPW37265M3pfQCgglAe
YxxpoGWdyPqRqevDrsw1qHY=
=f9cv
-----END PGP SIGNATURE-----