← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-14 18:14:19 UTC
  • mfrom: (6367 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6368.
  • Revision ID: jelmer@samba.org-20111214181419-sup6int3bfb3eup8
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
2795
2795
                # something is wrong, so lets determine what exactly
2796
2796
                if not self.has_filename(from_rel) and \
2797
2797
                   not self.has_filename(to_rel):
2798
 
                    raise errors.BzrRenameFailedError(from_rel,to_rel,
2799
 
                        errors.PathsDoNotExist(paths=(str(from_rel),
2800
 
                        str(to_rel))))
 
2798
                    raise errors.BzrRenameFailedError(from_rel, to_rel,
 
2799
                        errors.PathsDoNotExist(paths=(from_rel, to_rel)))
2801
2800
                else:
2802
2801
                    raise errors.RenameFailedFilesExist(from_rel, to_rel)
2803
2802
            rename_entry.only_change_inv = only_change_inv