/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/merge.py

  • Committer: Aaron Bentley
  • Date: 2005-11-25 04:30:47 UTC
  • mfrom: (1508.1.15)
  • mto: (1185.65.14 storage)
  • mto: This revision was merged to the branch mainline in revision 1550.
  • Revision ID: aaron.bentley@utoronto.ca-20051125043047-420c01b3982f9cda
Merged the mainline

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: