← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

[merge] refactoring of branch vs working tree, etc (robertc)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
115
115
                    if file_id is not None:
116
116
                        new_path = self.this_tree.relpath(new_name)
117
117
                        rename(new_name, name)
118
 
                        self.this_tree.branch.rename_one(relpath, new_path)
119
 
                        assert self.this_tree.id2path(file_id) == relpath
120
 
                        self.this_tree._inventory = self.this_tree.read_working_inventory()
 
118
                        self.this_tree.rename_one(relpath, new_path)
121
119
                        assert self.this_tree.id2path(file_id) == new_path
122
120
        except OSError, e:
123
121
            if e.errno != errno.EEXIST and e.errno != errno.ENOTEMPTY: