← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: v.ladeuil+lp at free
  • Date: 2006-11-08 07:44:30 UTC
  • mfrom: (2123 +trunk)
  • mto: (2145.1.1 keepalive)
  • mto: This revision was merged to the branch mainline in revision 2146.
  • Revision ID: v.ladeuil+lp@free.fr-20061108074430-a9c08d4a475bd97f
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1051
1051
                    osutils.rename(self.abspath(f), self.abspath(dest_path))
1052
1052
                except OSError, e:
1053
1053
                    raise BzrError("failed to rename %r to %r: %s" %
1054
 
                                   (f, dest_path, e[1]),
1055
 
                            ["rename rolled back"])
 
1054
                                   (f, dest_path, e[1]))
1056
1055
        except:
1057
1056
            # restore the inventory on error
1058
1057
            self._set_inventory(orig_inv, dirty=original_modified)
1104
1103
        except OSError, e:
1105
1104
            inv.rename(file_id, from_parent, from_name)
1106
1105
            raise BzrError("failed to rename %r to %r: %s"
1107
 
                    % (from_abs, to_abs, e[1]),
1108
 
                    ["rename rolled back"])
 
1106
                    % (from_abs, to_abs, e[1]))
1109
1107
        self._write_inventory(inv)
1110
1108
 
1111
1109
    @needs_read_lock