← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Andrew Bennetts
  • Date: 2009-10-02 05:43:41 UTC
  • mfrom: (4634.52.10 2.0)
  • mto: This revision was merged to the branch mainline in revision 4723.
  • Revision ID: andrew.bennetts@canonical.com-20091002054341-99yxpjenx8cagpxn
Merge lp:bzr/2.0 into lp:bzr, duplicating relevant NEWS entries for 2.1.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
2305
2305
    try:
2306
2306
        factory = entry_factory[kind]
2307
2307
    except KeyError:
2308
 
        raise BzrError("unknown kind %r" % kind)
 
2308
        raise errors.BadFileKindError(name, kind)
2309
2309
    return factory(file_id, name, parent_id)
2310
2310
 
2311
2311