Rev 2337: When upgrading, we can't assume that WorkingTree._inventory is valid, because that is now in http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/make_locking_cheaper

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/make_locking_cheaper

------------------------------------------------------------
revno: 2337
revision-id: john at arbash-meinel.com-20070321212157-3hmll50umf1nz1z3
parent: john at arbash-meinel.com-20070321181557-09nrfljkinlmyjmp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: make_locking_cheaper
timestamp: Wed 2007-03-21 16:21:57 -0500
message:
  When upgrading, we can't assume that WorkingTree._inventory is valid, because that is now
  done during tree.lock_*
modified:
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
-------------- next part --------------
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2007-03-10 21:39:07 +0000
+++ b/bzrlib/workingtree_4.py	2007-03-21 21:21:57 +0000
@@ -2279,6 +2279,7 @@
         # tree during upgrade.
         tree._control_files.lock_write()
         try:
+            tree.read_working_inventory()
             self.create_dirstate_data(tree)
             self.update_format(tree)
             self.remove_xml_files(tree)