← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/add.py

  • Committer: Brad Crittenden
  • Date: 2007-02-26 20:56:10 UTC
  • mfrom: (2300 +trunk)
  • mto: (2293.1.5 bzr.dev)
  • mto: This revision was merged to the branch mainline in revision 2311.
  • Revision ID: brad.crittenden@canonical.com-20070226205610-44oatbxrjjz3ajwy
merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/add.py
204
204
        # validate user parameters. Our recursive code avoids adding new files
205
205
        # that need such validation 
206
206
        if tree.is_control_filename(rf.raw_path):
207
 
            raise errors.ForbiddenControlFileError(filename=rf)
 
207
            raise errors.ForbiddenControlFileError(filename=rf.raw_path)
208
208
        
209
209
        abspath = tree.abspath(rf.raw_path)
210
210
        kind = bzrlib.osutils.file_kind(abspath)