← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/add.py

  • Committer: Martin Pool
  • Date: 2005-05-15 02:36:04 UTC
  • Revision ID: mbp@sourcefrog.net-20050515023603-7328f6cbabd2b09a
- Merge aaron's merge command

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/add.py
54
54
        if bzrlib.branch.is_control_file(af):
55
55
            bailout("cannot add control file %r" % af)
56
56
 
57
 
        kind = bzrlib.osutils.file_kind(f)
58
 
 
59
 
        if kind != 'file' and kind != 'directory':
60
 
            bailout("can't add file '%s' of kind %r" % (f, kind))
61
57
            
62
58
        versioned = (inv.path2id(rf) != None)
63
59