Rev 2310: add extra flush() call to make _update_tree work for dirstate. in http://bazaar.launchpad.net/%7Ebzr/bzr/dirstate

[John Arbash Meinel]

At http://bazaar.launchpad.net/%7Ebzr/bzr/dirstate

------------------------------------------------------------
revno: 2310
revision-id: john at arbash-meinel.com-20070214220734-2ekcmk21rhm2z5dw
parent: robertc at robertcollins.net-20070214215125-ugt6gf11ywavs2y1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-14 16:07:34 -0600
message:
  add extra flush() call to make _update_tree work for dirstate.
modified:
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
-------------- next part --------------
=== modified file 'bzrlib/workingtree.py'
--- a/bzrlib/workingtree.py	2007-02-14 20:33:33 +0000
+++ b/bzrlib/workingtree.py	2007-02-14 22:07:34 +0000
@@ -1878,6 +1878,14 @@
             # and we have converted that last revision to a pending merge.
             # base is somewhere between the branch tip now
             # and the now pending merge
+
+            # Since we just modified the working tree and inventory, flush out
+            # the current state, before we modify it again.
+            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
+            #       requires it only because TreeTransform directly munges the
+            #       inventory and calls tree._write_inventory(). Ultimately we
+            #       should be able to remove this extra flush.
+            self.flush()
             from bzrlib.revision import common_ancestor
             try:
                 base_rev_id = common_ancestor(self.branch.last_revision(),