← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Marius Kruger
  • Date: 2007-01-19 09:47:38 UTC
  • mto: This revision was merged to the branch mainline in revision 2241.
  • Revision ID: amanic@gmail.com-20070119094738-zzjsna2p0lupx92a
* bzrlib/errors.py
  Changed "FilesExist" to more specific "RenameFailedFilesExist"

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1130
1130
                        errors.PathsDoNotExist(paths=(str(from_rel),
1131
1131
                        str(to_rel))))
1132
1132
                else:
1133
 
                    raise errors.BzrRenameFailedError(from_rel,to_rel,
1134
 
                        errors.FilesExist(paths=(str(from_rel), str(to_rel)),
1135
 
                        extra="(Use --after to update the Bazaar id)"))
 
1133
                    raise errors.RenameFailedFilesExist(from_rel, to_rel,
 
1134
                        extra="(Use --after to update the Bazaar id)")
1136
1135
            rename_entry.only_change_inv = only_change_inv
1137
1136
        return rename_entries
1138
1137