← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/add.py

  • Committer: Robert Collins
  • Date: 2005-10-04 03:35:31 UTC
  • mfrom: (1393.1.30)
  • Revision ID: robertc@robertcollins.net-20051004033531-f057603b470ca4a2
merge from mpool

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/add.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
 
17
from bzrlib.inventory import InventoryEntry
17
18
from bzrlib.trace import mutter, note, warning
18
19
from bzrlib.errors import NotBranchError
19
20
from bzrlib.branch import Branch
95
96
 
96
97
        kind = bzrlib.osutils.file_kind(af)
97
98
 
98
 
        if kind != 'file' and kind != 'directory' and kind != 'symlink':
 
99
        if not InventoryEntry.versionable_kind(kind):
99
100
            if f in user_list:
100
101
                raise BadFileKindError("cannot add %s of type %s" % (f, kind))
101
102
            else: