← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Aaron Bentley
  • Date: 2007-01-20 01:44:46 UTC
  • mto: This revision was merged to the branch mainline in revision 2241.
  • Revision ID: aaron.bentley@utoronto.ca-20070120014446-2znre037lrj823cd
Cleanup formatting and error handling

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1160
1160
                    entry.to_tail, entry.to_parent_id, entry.from_rel,
1161
1161
                    entry.from_tail, entry.from_parent_id,
1162
1162
                    entry.only_change_inv))
1163
 
            except OSError, e:
 
1163
            except errors.BzrMoveFailedError, e:
1164
1164
                raise errors.BzrMoveFailedError( '', '', "Rollback failed."
1165
1165
                        " The working tree is in an inconsistent state."
1166
1166
                        " Please consider doing a 'bzr revert'."
1167
 
                        " Error message is: %s" % e[1])
 
1167
                        " Error message is: %s" % e)
1168
1168
 
1169
1169
    def _move_entry(self, entry):
1170
1170
        inv = self.inventory