~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Daniel Watkins
  • Date: 2007-11-13 02:09:03 UTC
  • mto: This revision was merged to the branch mainline in revision 2983.
  • Revision ID: d.m.watkins@warwick.ac.uk-20071113020903-ekqzrah1rtfy6cll
Extracted the string from every use of RenameFailedFilesExist to RenameFailedFilesExist itself.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1326
1326
                        errors.PathsDoNotExist(paths=(str(from_rel),
1327
1327
                        str(to_rel))))
1328
1328
                else:
1329
 
                    raise errors.RenameFailedFilesExist(from_rel, to_rel,
1330
 
                        extra="(Use --after to tell bzr about a rename that has"
1331
 
                               " already happened)")
 
1329
                    raise errors.RenameFailedFilesExist(from_rel, to_rel)
1332
1330
            rename_entry.only_change_inv = only_change_inv
1333
1331
        return rename_entries
1334
1332