/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

Restore dirstate to all tests passing condition.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1851
1851
            basis.lock_read()
1852
1852
            try:
1853
1853
                to_tree = self.branch.basis_tree()
1854
 
                if basis.inventory.root is None:
 
1854
                if basis.inventory.root is None and self.inventory.root is None:
1855
1855
                    self.set_root_id(to_tree.inventory.root.file_id)
1856
1856
                result += merge.merge_inner(
1857
1857
                                      self.branch,