[MERGE][0.15.0]

[Aaron Bentley]

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

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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFF7znQ0F+nu1YWqI0RArqwAKCEzbsRPgmaa9CLEP0Z/tsQMVyotACfQKGD
hqvlIA4KvRFW1mNPLq881ds=
=pxR4
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: extract-in-lock.patch
Type: text/x-patch
Size: 1810 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070307/e7bbfdf4/attachment.bin