/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-10 18:31:36 UTC
  • mto: (0.200.1845 work)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180310183136-g155w0rdiobsmgaa
Fix breezy.tests.per_workingtree.test_rename_one.TestRenameOne.test_rename_one_fail_consistent

Show diffs side-by-side

added added

removed removed

Lines of Context:
workingtree.py
567
567
                    to_kind = self.kind(to_rel)
568
568
                except errors.NoSuchFile:
569
569
                    exc_type = errors.BzrRenameFailedError
 
570
                    to_kind = None
570
571
                else:
571
572
                    exc_type = errors.BzrMoveFailedError
572
573
                if not self.has_filename(from_rel):
578
579
                if self.is_versioned(to_rel):
579
580
                    raise exc_type(from_rel, to_rel,
580
581
                        errors.AlreadyVersionedError(to_rel))
 
582
                if self.has_filename(to_rel):
 
583
                    raise errors.RenameFailedFilesExist(
 
584
                        from_rel, to_rel, errors.FileExists(to_rel))
581
585
            else:
582
586
                if not self.has_filename(to_rel):
583
587
                    raise errors.BzrMoveFailedError(from_rel, to_rel,