← 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: 2006-06-10 18:52:59 UTC
  • mto: (1767.2.2 integration)
  • mto: This revision was merged to the branch mainline in revision 1769.
  • Revision ID: robertc@robertcollins.net-20060610185259-c8f971c890079308
Split out the recursive add and add of a single entry in add.py.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
1024
1024
        except KeyError:
1025
1025
            raise BzrError("parent_id {%s} not in inventory" % entry.parent_id)
1026
1026
 
1027
 
        if parent.children.has_key(entry.name):
 
1027
        if entry.name in parent.children:
1028
1028
            raise BzrError("%s is already versioned" %
1029
1029
                    pathjoin(self.id2path(parent.file_id), entry.name))
1030
1030