/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

add extra flush() call to make _update_tree work for dirstate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1878
1878
            # and we have converted that last revision to a pending merge.
1879
1879
            # base is somewhere between the branch tip now
1880
1880
            # and the now pending merge
 
1881
 
 
1882
            # Since we just modified the working tree and inventory, flush out
 
1883
            # the current state, before we modify it again.
 
1884
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
1885
            #       requires it only because TreeTransform directly munges the
 
1886
            #       inventory and calls tree._write_inventory(). Ultimately we
 
1887
            #       should be able to remove this extra flush.
 
1888
            self.flush()
1881
1889
            from bzrlib.revision import common_ancestor
1882
1890
            try:
1883
1891
                base_rev_id = common_ancestor(self.branch.last_revision(),