← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: mbp at sourcefrog
  • Date: 2005-04-05 08:34:04 UTC
  • Revision ID: mbp@sourcefrog.net-20050405083404-9a929232da9d8ad4
better error message when working file rename fails

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
730
730
        mutter("  to_dir_id  {%s}" % to_dir_id)
731
731
            
732
732
        inv.rename(file_id, to_dir_id, to_tail)
733
 
        os.rename(self.abspath(from_rel), self.abspath(to_rel))
 
733
        
 
734
        from_abs = self.abspath(from_rel)
 
735
        to_abs = self.abspath(to_rel)
 
736
        try:
 
737
            os.rename(from_abs, to_abs)
 
738
        except OSError, e:
 
739
            bailout("failed to rename %r to %r: %s"
 
740
                    % (from_abs, to_abs, e[1]),
 
741
                    ["rename rolled back"])
734
742
 
735
743
        self._write_inventory(inv)
736
744