← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Robert Collins
  • Date: 2005-11-28 05:13:41 UTC
  • mfrom: (1185.33.54 merge-recovered)
  • Revision ID: robertc@robertcollins.net-20051128051341-059936f2f29a12c8
Merge from Martin. Adjust check to work with HTTP again.

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: