~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.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:
720
720
                if from_missing: # implicitly just update our path mapping
721
721
                    move_file = False
722
722
                elif not after:
723
 
                    raise errors.RenameFailedFilesExist(from_rel, to_rel,
724
 
                        extra="(Use --after to tell bzr about a rename that has"
725
 
                               " already happened)")
 
723
                    raise errors.RenameFailedFilesExist(from_rel, to_rel)
726
724
 
727
725
            rollbacks = []
728
726
            def rollback_rename():