/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 bzrlib/add.py

Merge from bzr.dev.  Breaks a few tests because there are new methods not yet implemented.

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)