← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mutabletree.py

[merge] bzr.dev 2255, resolve conflicts, update copyrights

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mutabletree.py
100
100
            if self.is_control_filename(f):
101
101
                raise errors.ForbiddenControlFileError(filename=f)
102
102
            fp = splitpath(f)
103
 
            if len(fp) == 0:
104
 
                raise BzrError("cannot add top-level %r" % f)
105
103
        # fill out file kinds for all files [not needed when we stop 
106
104
        # caring about the instantaneous file kind within a uncommmitted tree
107
105
        #