← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Merged Martin

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
111
111
                        rename(new_name, name)
112
112
                        self.this_tree.branch.rename_one(relpath, new_path)
113
113
                        assert self.this_tree.id2path(file_id) == relpath
114
 
                        self.this_tree._inventory = self.this_tree.branch.inventory
 
114
                        self.this_tree._inventory = self.this_tree.read_working_inventory()
115
115
                        assert self.this_tree.id2path(file_id) == new_path
116
116
        except OSError, e:
117
117
            if e.errno != errno.EEXIST and e.errno != errno.ENOTEMPTY:
540
540
                path = path[2:]
541
541
            adjust_ids.append((path, id))
542
542
        if len(adjust_ids) > 0:
543
 
            self.this_branch.set_inventory(self.regen_inventory(adjust_ids))
 
543
            self.this_branch.working_tree().set_inventory(self.regen_inventory(adjust_ids))
544
544
        conflicts = self.conflict_handler.conflicts
545
545
        self.conflict_handler.finalize()
546
546
        return conflicts
547
547
 
548
548
    def regen_inventory(self, new_entries):
549
 
        old_entries = self.this_branch.read_working_inventory()
 
549
        old_entries = self.this_branch.working_tree().read_working_inventory()
550
550
        new_inventory = {}
551
551
        by_path = {}
552
552
        new_entries_map = {}