/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Aaron Bentley
  • Date: 2005-11-25 04:30:47 UTC
  • mfrom: (1508.1.15)
  • mto: (1185.65.14 storage)
  • mto: This revision was merged to the branch mainline in revision 1550.
  • Revision ID: aaron.bentley@utoronto.ca-20051125043047-420c01b3982f9cda
Merged the mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
877
877
        The immediate parent must already be versioned.
878
878
 
879
879
        Returns the new entry object."""
880
 
        from bzrlib.branch import gen_file_id
 
880
        from bzrlib.workingtree import gen_file_id
881
881
        
882
882
        parts = bzrlib.osutils.splitpath(relpath)
883
883
        if len(parts) == 0: