← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: mbp at sourcefrog
  • Date: 2005-03-29 07:15:34 UTC
  • Revision ID: mbp@sourcefrog.net-20050329071534-e7e920a0237295f9
fix error message for repeated add

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
343
343
            bailout("attempt to add under non-directory {%s}" % parent.file_id)
344
344
 
345
345
        if parent.children.has_key(entry.name):
346
 
            bailout("{%s} already has child %r" % (parent.file_id, entry.name))
 
346
            bailout("%s is already versioned" %
 
347
                    appendpath(self.id2path(parent.file_id), entry.name))
347
348
 
348
349
        self._byid[entry.file_id] = entry
349
350
        parent.children[entry.name] = entry