← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Martin Pool
  • Date: 2006-06-20 04:45:30 UTC
  • mto: This revision was merged to the branch mainline in revision 1798.
  • Revision ID: mbp@sourcefrog.net-20060620044530-6e8a6f4b6f3bc525
Cleanup of imports; undeprecate all_revision_ids()

Thanks to John for review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
596
596
        inv = self.read_working_inventory()
597
597
        for f,file_id in zip(files, ids):
598
598
            if self.is_control_filename(f):
599
 
                raise errors.ForbiddenFileError(filename=f)
 
599
                raise errors.ForbiddenControlFileError(filename=f)
600
600
 
601
601
            fp = splitpath(f)
602
602