~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/textinv.py

  • Committer: Robert J. Tanner
  • Date: 2009-05-16 08:21:11 UTC
  • mfrom: (4360.3.1 bzr.1.15)
  • mto: This revision was merged to the branch mainline in revision 4370.
  • Revision ID: tanner@real-time.com-20090516082111-gx9dvo4ob1ptblkj
Merge 1.15rc1 back to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
 
17
17
 
18
18
from bzrlib.errors import BzrError
19
 
from bzrlib.inventory import Inventory
 
19
from bzrlib.inventory import InventoryEntry, Inventory
20
20
 
21
21
 
22
22
START_MARK = "# bzr inventory format 3\n"