← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/textinv.py

  • Committer: Robert Collins
  • Date: 2006-06-16 15:59:24 UTC
  • mto: (1780.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1781.
  • Revision ID: robertc@robertcollins.net-20060616155924-b8a6591d32f8ab20
New corner case from John Meinel, showing up the need to check the directory lexographically outside of a single tree's root. Fixed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/textinv.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
 
from errors import BzrError
19
 
from inventory import InventoryEntry, Inventory
 
18
from bzrlib.errors import BzrError
 
19
from bzrlib.inventory import InventoryEntry, Inventory
20
20
 
21
21
 
22
22
START_MARK = "# bzr inventory format 3\n"
69
69
    outf.write(END_MARK)
70
70
 
71
71
 
72
 
 
73
 
 
74
72
def read_text_inventory(tf):
75
73
    """Return an inventory read in from tf"""
76
74
    if tf.readline() != START_MARK: