← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/add.py

[merge] bzr.dev 2298 (broken)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/add.py
212
212
        # validate user parameters. Our recursive code avoids adding new files
213
213
        # that need such validation 
214
214
        if tree.is_control_filename(rf.raw_path):
215
 
            raise errors.ForbiddenControlFileError(filename=rf)
 
215
            raise errors.ForbiddenControlFileError(filename=rf.raw_path)
216
216
        
217
217
        abspath = tree.abspath(rf.raw_path)
218
218
        kind = bzrlib.osutils.file_kind(abspath)